diff --git a/.cargo/config b/.cargo/config
index 2c96d20f..8ebcc839 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,4 +1,4 @@
 # TODO: we shouldn't check this in to git, need to figure out how to avoid doing
 # that.
 [target.wasm32-unknown-unknown]
-runner = 'cargo +nightly run -p wasm-bindgen-cli --bin wasm-bindgen-test-runner --'
+runner = 'cargo run -p wasm-bindgen-cli --bin wasm-bindgen-test-runner --'
diff --git a/.travis.yml b/.travis.yml
index 1d045516..79460855 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,8 +49,8 @@ INSTALL_AWS: &INSTALL_AWS
 
 matrix:
   include:
-    # Tests pass on nightly
-    - rust: nightly
+    # Tests for wasm-bindgen itself pass
+    - rust: beta
       env: JOB=test-bindgen
       install:
         - *INSTALL_NODE_VIA_NVM
@@ -62,7 +62,6 @@ matrix:
         - cargo test
         # Run the main body of the test suite
         - cargo test --target wasm32-unknown-unknown
-        - cargo test --target wasm32-unknown-unknown --features nightly
         # Rerun the test suite but disable `--debug` in generated JS
         - WASM_BINDGEN_NO_DEBUG=1 cargo test --target wasm32-unknown-unknown
         # Make sure our serde tests work
@@ -76,6 +75,15 @@ matrix:
         firefox: latest
       if: branch = master
 
+    # Tests the `nightly` feature of wasm-bindgen
+    - rust: nightly
+      env: JOB=test-bindgen-nightly
+      install:
+        - *INSTALL_NODE_VIA_NVM
+      script:
+        - cargo test --target wasm32-unknown-unknown --features nightly --test wasm
+      if: branch = master
+
     # All examples work
     - rust: nightly
       env: JOB=examples-build
@@ -95,8 +103,8 @@ matrix:
         - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then aws s3 sync --quiet ~/$TRAVIS_BUILD_NUMBER s3://wasm-bindgen-ci/$TRAVIS_BUILD_NUMBER; fi
       if: branch = master
 
-    # The `web-sys` crate's tests pass on nightly.
-    - rust: nightly
+    # The `web-sys` crate's tests pass
+    - rust: beta
       env: JOB=test-web-sys
       install:
         - *INSTALL_NODE_VIA_NVM
@@ -118,8 +126,8 @@ matrix:
         chrome: stable
       if: branch = master
 
-    # The `js-sys` crate's tests pass on nightly.
-    - rust: nightly
+    # The `js-sys` crate's tests pass
+    - rust: beta
       env: JOB=test-js-sys
       install:
         - *INSTALL_NODE_VIA_NVM
@@ -134,8 +142,8 @@ matrix:
         chrome: stable
       if: branch = master
 
-    # WebIDL tests pass on nightly
-    - rust: nightly
+    # WebIDL tests pass
+    - rust: beta
       env: JOB=test-webidl
       install: *INSTALL_NODE_VIA_NVM
       script:
@@ -172,14 +180,9 @@ matrix:
       env: JOB=check-stable-cli
       script: cargo check --manifest-path crates/cli/Cargo.toml
       if: branch = master
-    # CLI builds on nightly
-    - rust: nightly
-      env: JOB=check-nightly-cli
-      script: cargo check --manifest-path crates/cli/Cargo.toml
-      if: branch = master
 
     # Build mdbook documentation
-    - rust: nightly
+    - rust: stable
       env: JOB=guide-build
       install:
         - mkdir -p $HOME/mdbook