diff --git a/.travis.yml b/.travis.yml
index e8931af..511e69c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,20 @@
 cache: cargo
 dist: trusty
 language: rust
+rust: nightly
 services: docker
 sudo: required
-rust: nightly
 
 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
     - env: TARGET=i686-apple-darwin
-      # FIXME(rust-lang/rust#36793)
-      rust: nightly-2016-09-10
       os: osx
     - env: TARGET=i686-unknown-linux-gnu
-      # FIXME(rust-lang/rust#36793)
-      rust: nightly-2016-09-10
     - env: TARGET=mips-unknown-linux-gnu
     - env: TARGET=mipsel-unknown-linux-gnu
     - env: TARGET=powerpc-unknown-linux-gnu