diff --git a/.travis.yml b/.travis.yml
index 96b1137..84654fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,6 @@ matrix:
   include:
     - env: TARGET=aarch64-unknown-linux-gnu
     - env: TARGET=arm-unknown-linux-gnueabi
-      # FIXME(rust-lang/rust#36518)
-      rust: nightly-2016-09-21
     - env: TARGET=arm-unknown-linux-gnueabihf
     - env: TARGET=armv7-unknown-linux-gnueabihf
     - env: TARGET=i586-unknown-linux-gnu
@@ -51,11 +49,6 @@ script:
   # Travis can't cache files that are not readable by "others"
   - chmod -R a+r $HOME/.cargo
 
-branches:
-  only:
-    - auto
-    - try
-
 notifications:
   email:
     on_success: never
diff --git a/appveyor.yml b/appveyor.yml
index 52afc97..f27347c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,12 +14,7 @@ install:
 build: false
 
 test_script:
-  - cargo build
-  - cargo build --release
-  - cargo test
-  - cargo test --release
-
-branches:
-  only:
-    - auto
-    - try
+  - cargo build --target %TARGET%
+  - cargo build --release --target %TARGET%
+  - cargo test --target %TARGET%
+  - cargo test --release --target %TARGET%