diff --git a/.travis.yml b/.travis.yml
index 2694bc31..79882f6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,16 @@ addons:
 cache:
   yarn: true
 
-env:
-  global:
-    # See https://git.io/vdao3 for details.
-    - JOBS=1
-  matrix:
+stages:
+  - test
+
+matrix:
+  # we recommend testing addons with the same minimum supported node version as Ember CLI
+  # so that your addon works for all apps
+  fast_finish: true
+  allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-canary
+  include:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
     - EMBER_TRY_SCENARIO=ember-lts-2.12
@@ -27,12 +32,14 @@ env:
     - EMBER_TRY_SCENARIO=ember-canary
     - EMBER_TRY_SCENARIO=ember-default
 
-matrix:
-  # we recommend testing addons with the same minimum supported node version as Ember CLI
-  # so that your addon works for all apps
-  fast_finish: true
-  allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-canary
+jobs:
+  fail_fast: true
+
+  include:
+    - stage: test
+      env: NAME=TEST
+      node_js: 4
+      script: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -44,6 +51,3 @@ install:
 script:
   - if [ $TRAVIS_BRANCH = '^((?!greenkeeper/).)*$' ]; then yarn update; fi
   - yarn lint:js
-  # Usually, it's ok to finish the test scenario without reverting
-  #  to the addon's original dependency state, skipping "cleanup".
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup