diff --git a/.travis.yml b/.travis.yml
index 3f5e7062e..de6cb4dbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,16 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
+  - "6"
+  - "7"
 
 sudo: false
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bower's cache
 
 env:
   - EMBER_TRY_SCENARIO=default
@@ -23,7 +26,7 @@ matrix:
 before_install:
   - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - "npm install -g npm@^4"
 
 install:
   - npm install -g bower
diff --git a/blueprints/ember-cli-mirage/index.js b/blueprints/ember-cli-mirage/index.js
index 8934fe581..8569d31a0 100644
--- a/blueprints/ember-cli-mirage/index.js
+++ b/blueprints/ember-cli-mirage/index.js
@@ -30,29 +30,29 @@ module.exports = {
   },
 
   afterInstall: function() {
-    this.insertIntoFile('.jshintrc', '    "server",', {
+    return this.insertIntoFile('.jshintrc', '    "server",', {
       after: '"predef": [\n'
-    });
-
-    this.insertIntoFile('tests/.jshintrc', '    "server",', {
-      after: '"predef": [\n'
-    });
-
-    if (existsSync('tests/helpers/destroy-app.js')) {
-      this.insertIntoFile('tests/helpers/destroy-app.js', '  server.shutdown();', {
-        after: "Ember.run(application, 'destroy');\n"
+    }).then(() => {
+      return this.insertIntoFile('tests/.jshintrc', '    "server",', {
+        after: '"predef": [\n'
+      }).then(() =>{
+        if (existsSync('tests/helpers/destroy-app.js')) {
+          return this.insertIntoFile('tests/helpers/destroy-app.js', '  server.shutdown();', {
+            after: "Ember.run(application, 'destroy');\n"
+          });
+        } else {
+          this.ui.writeLine(
+            EOL +
+            chalk.yellow(
+              '******************************************************' + EOL +
+              'destroy-app.js helper is not present. Please read this' + EOL +
+              'https://gist.github.com/blimmer/35d3efbb64563029505a' + EOL +
+              'to see how to fix the problem.' + EOL +
+              '******************************************************' + EOL
+            )
+          );
+        }
       });
-    } else {
-      this.ui.writeLine(
-        EOL +
-        chalk.yellow(
-          '******************************************************' + EOL +
-          'destroy-app.js helper is not present. Please read this' + EOL +
-          'https://gist.github.com/blimmer/35d3efbb64563029505a' + EOL +
-          'to see how to fix the problem.' + EOL +
-          '******************************************************' + EOL
-        )
-      );
-    }
+    });
   }
 };
diff --git a/bower.json b/bower.json
index 1828680f4..badccc1c0 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,7 @@
   "name": "ember-cli-mirage",
   "dependencies": {
     "jquery": "2.1.4",
-    "ember": "2.3.0",
+    "ember": "2.10.0",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
diff --git a/package.json b/package.json
index 1b08b31b1..5b3526dcd 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "ember-cli-release": "0.2.8",
     "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.3.0",
+    "ember-data": "^2.10.0",
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",