diff --git a/.travis.yml b/.travis.yml
index dfd09197..13699823 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,20 @@
 language: rust
 sudo: false
+cache: cargo
+
+branches:
+  only:
+    - master
+    - staging
+    - trying
 
 matrix:
+  fast_finish: true
+
+  allow_failures:
+    - rust: nightly
+      env: ALLOW_FAILURES=true
+
   include:
     - rust: 1.30.0
     - rust: stable
@@ -10,14 +23,31 @@ matrix:
       script:
         - cargo test
         - cargo test --all-features
-        - cargo doc --all-features --no-deps -p auto_enums -p auto_enums_core -p auto_enums_derive
         - cd "${TRAVIS_BUILD_DIR}/test_suite"
         - cargo test
         - cargo test --no-default-features
         - cargo test --all-features
+
+    - rust: nightly
+      name: cargo test (minimal versions)
+      env: ALLOW_FAILURES=true
+      script:
+        - cargo update -Zminimal-versions
+        - cargo test --all-features
+        - cd "${TRAVIS_BUILD_DIR}/test_suite"
+        - cargo test --all-features
+
+    - rust: nightly
+      name: cargo test (2018 edition)
+      script:
         - cd "${TRAVIS_BUILD_DIR}/test_suite/tests_2018"
         - cargo test --all-features
 
+    - rust: nightly
+      name: cargo doc
+      script:
+        - cargo doc --all-features --no-deps -p auto_enums -p auto_enums_core -p auto_enums_derive
+
 before_script:
   - set -o errexit
 
@@ -28,4 +58,5 @@ script:
   - cargo test --no-default-features
 
 notifications:
-  email: false
+  email:
+    on_success: never
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 00000000..359f8947
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1 @@
+status = ["continuous-integration/travis-ci/push"]
diff --git a/test_suite/tests/test_auto_enum.rs b/test_suite/tests/test_auto_enum.rs
index 2e9efae3..8dfdfd2d 100644
--- a/test_suite/tests/test_auto_enum.rs
+++ b/test_suite/tests/test_auto_enum.rs
@@ -1,6 +1,5 @@
-#![cfg_attr(feature = "unstable", feature(proc_macro_hygiene))]
-#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]
-#![cfg_attr(feature = "unstable", feature(arbitrary_self_types, futures_api))]
+#![cfg_attr(feature = "unstable", feature(proc_macro_hygiene, stmt_expr_attributes))]
+#![cfg_attr(feature = "unstable", feature(futures_api))]
 #![cfg_attr(feature = "unstable", feature(fn_traits, unboxed_closures))]
 #![cfg_attr(feature = "unstable", feature(read_initializer))]
 #![cfg_attr(feature = "unstable", feature(trusted_len))]
diff --git a/test_suite/tests/test_enum_derive.rs b/test_suite/tests/test_enum_derive.rs
index 59da480b..2476cb5a 100644
--- a/test_suite/tests/test_enum_derive.rs
+++ b/test_suite/tests/test_enum_derive.rs
@@ -1,6 +1,5 @@
-#![cfg_attr(feature = "unstable", feature(proc_macro_hygiene))]
-#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]
-#![cfg_attr(feature = "unstable", feature(arbitrary_self_types, futures_api))]
+#![cfg_attr(feature = "unstable", feature(proc_macro_hygiene, stmt_expr_attributes))]
+#![cfg_attr(feature = "unstable", feature(futures_api))]
 #![cfg_attr(feature = "unstable", feature(fn_traits, unboxed_closures))]
 #![cfg_attr(feature = "unstable", feature(read_initializer))]
 #![cfg_attr(feature = "unstable", feature(trusted_len))]
diff --git a/test_suite/tests_2018/tests/test.rs b/test_suite/tests_2018/tests/test.rs
index b2bb252b..50d8d49e 100644
--- a/test_suite/tests_2018/tests/test.rs
+++ b/test_suite/tests_2018/tests/test.rs
@@ -1,6 +1,5 @@
-#![cfg_attr(feature = "unstable", feature(proc_macro_hygiene))]
-#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]
-#![cfg_attr(feature = "unstable", feature(arbitrary_self_types, futures_api))]
+#![cfg_attr(feature = "unstable", feature(proc_macro_hygiene, stmt_expr_attributes))]
+#![cfg_attr(feature = "unstable", feature(futures_api))]
 #![cfg_attr(feature = "unstable", feature(fn_traits, unboxed_closures))]
 #![cfg_attr(feature = "unstable", feature(read_initializer))]
 #![cfg_attr(feature = "unstable", feature(trusted_len))]