diff --git a/.travis.yml b/.travis.yml
index b04a2673b..8cc900185 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,30 +8,25 @@ julia:
   - 1.2
   - 1.3
   - nightly
-matrix:
-  allow_failures:
-  - julia: 1.3
-  - julia: nightly
-notifications:
-  email:
-    recipients:
-      - nightly-rse@invenia.ca
-    on_success: never
-    on_failure: always
-    if: type = cron
-# uncomment the following lines to override the default test script
-#script:
-#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-#  - julia -e 'Pkg.clone(pwd()); Pkg.build("ChainRules"); Pkg.test("ChainRules"; coverage=true)'
-after_success:
-  # push coverage results to Coveralls
-  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
 jobs:
+  allow_failures:
+    - julia: 1.3
+    - julia: nightly
   include:
-    - state: "Documentation"
+    - stage: "Documentation"
       julia: 1.0
       os: linux
       script:
         - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
         - julia --project=docs/ docs/make.jl
       after_success: skip
+
+after_success:
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+notifications:
+  email:
+    recipients:
+      - nightly-rse@invenia.ca
+    on_success: never
+    on_failure: always
+    if: type = cron