diff --git a/package.json b/package.json
index b8c56bbcb..5dae11cc2 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,11 @@
   "devDependencies": {
     "broccoli-asset-rev": "2.2.0",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.3.0",
+    "ember-cli": "2.4.0",
     "ember-cli-app-version": "1.0.0",
     "ember-cli-babel": "5.1.5",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "1.1.0",
+    "ember-cli-dependency-checker": "1.2.0",
     "ember-cli-deprecation-workflow": "0.1.6",
     "ember-cli-fastclick": "1.0.3",
     "ember-cli-htmlbars": "1.0.1",
diff --git a/testem.js b/testem.js
new file mode 100644
index 000000000..bea2f315f
--- /dev/null
+++ b/testem.js
@@ -0,0 +1,14 @@
+/*jshint node:true*/
+module.exports = {
+    'framework': 'mocha',
+    'test_page': 'tests/index.html?hidepassed',
+    'disable_watching': true,
+    'launch_in_ci': [
+        'Chrome',
+        'Firefox'
+    ],
+    'launch_in_dev': [
+        'Chrome',
+        'Firefox'
+    ]
+};
diff --git a/testem.json b/testem.json
deleted file mode 100644
index 79d466a5c..000000000
--- a/testem.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "framework": "mocha",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "Chrome",
-    "Firefox"
-  ],
-  "launch_in_dev": [
-    "Chrome",
-    "Firefox"
-  ]
-}
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
index f2377a974..67abb9113 100644
--- a/tests/helpers/module-for-acceptance.js
+++ b/tests/helpers/module-for-acceptance.js
@@ -13,11 +13,11 @@ export default function (name, options = {}) {
         },
 
         afterEach() {
-            destroyApp(this.application);
-
             if (options.afterEach) {
                 options.afterEach.apply(this, arguments);
             }
+
+            destroyApp(this.application);
         }
     });
 }