diff --git a/.travis.yml b/.travis.yml
index f8ac717..cc759ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,17 @@
 ---
 language: node_js
 node_js:
-  - "stable"
+  - "4"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   directories:
     - $HOME/.npm
-    - $HOME/.cache
 
 env:
   - EMBER_TRY_SCENARIO=1.13
@@ -24,17 +27,11 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
-    - env: EMBER_TRY_SCENARIO=fastboot-addon-tests
 
 before_install:
   - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
-  - bower --version
-  - phantomjs --version
-
-install:
-  - npm install
-  - bower install
+  - npm install -g npm@4
+  - npm --version
 
 script:
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
diff --git a/package.json b/package.json
index 71234f6..0376abf 100644
--- a/package.json
+++ b/package.json
@@ -22,39 +22,35 @@
     "version": "npm run update-changlog && git add CHANGELOG.md"
   },
   "dependencies": {
-    "broccoli-funnel": "^1.0.0",
-    "broccoli-merge-trees": "^1.0.0",
-    "ember-cli-babel": "^5.1.7",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-getowner-polyfill": "^1.2.2",
-    "ember-wormhole": "^0.5.1",
+    "broccoli-funnel": "^1.2.0",
+    "broccoli-merge-trees": "^2.0.0",
+    "ember-cli-babel": "^6.8.1",
+    "ember-cli-htmlbars": "^2.0.3",
+    "ember-getowner-polyfill": "^2.0.1",
+    "ember-wormhole": "^0.5.2",
     "mobiledoc-dom-renderer": "^0.6.5"
   },
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.2",
-    "chai": "^3.5.0",
-    "conventional-changelog": "^1.1.0",
-    "conventional-changelog-cli": "^1.1.1",
-    "ember-cli": "2.11.1",
-    "ember-cli-app-version": "^1.0.0",
+    "broccoli-asset-rev": "^2.6.0",
+    "chai": "^4.1.1",
+    "conventional-changelog": "^1.1.4",
+    "conventional-changelog-cli": "^1.3.2",
+    "ember-cli": "~2.14.2",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
-    "ember-cli-inject-live-reload": "^1.4.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.3",
+    "ember-cli-inject-live-reload": "^1.7.0",
     "ember-cli-jshint": "^2.0.1",
-    "ember-cli-qunit": "^3.0.1",
-    "ember-cli-release": "^0.2.9",
-    "ember-cli-shims": "^1.0.2",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
+    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-shims": "^1.1.0",
+    "ember-cli-sri": "^2.1.1",
     "ember-cli-uglify": "^1.2.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-disable-proxy-controllers": "^1.0.1",
-    "ember-export-application-global": "^1.0.5",
-    "ember-fastboot-addon-tests": "0.2.2",
-    "ember-load-initializers": "^0.6.0",
-    "ember-resolver": "^2.0.3",
-    "ember-source": "~2.11.0",
-    "loader.js": "^4.0.10"
+    "ember-disable-prototype-extensions": "^1.1.3",
+    "ember-export-application-global": "^2.0.0",
+    "ember-fastboot-addon-tests": "^0.4.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.4.0",
+    "ember-source": "~2.14.1",
+    "loader.js": "^4.6.0"
   },
   "engines": {
     "node": ">= 0.12.0"
diff --git a/testem.js b/testem.js
index 26044b2..7a3ebda 100644
--- a/testem.js
+++ b/testem.js
@@ -4,10 +4,17 @@ module.exports = {
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [
-    "PhantomJS"
+    "Chrome"
   ],
   "launch_in_dev": [
-    "PhantomJS",
     "Chrome"
-  ]
+  ],
+  browser_args: {
+    Chrome: [
+      '--disable-gpu',
+      '--headless',
+      '--remote-debugging-port=9222',
+      '--window-size=1440,900'
+    ]
+  }
 };
diff --git a/tests/test-helper.js b/tests/test-helper.js
index e6cfb70..f219659 100644
--- a/tests/test-helper.js
+++ b/tests/test-helper.js
@@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
 import {
   setResolver
 } from 'ember-qunit';
+import { start } from 'ember-cli-qunit';
 
 setResolver(resolver);
+start();