diff --git a/blueprints/ember-cli-mocha/index.js b/blueprints/ember-cli-mocha/index.js
index ccf0583..e6d79d2 100644
--- a/blueprints/ember-cli-mocha/index.js
+++ b/blueprints/ember-cli-mocha/index.js
@@ -13,8 +13,6 @@ module.exports = {
     var addonContext = this;
 
     return this.addBowerPackagesToProject([
-      { name: 'mocha',                 source: 'mocha',                 target: '~2.2.4' },
-      { name: 'chai',                  source: 'chai',                  target: '~2.3.0' },
       { name: 'ember-mocha-adapter',   source: 'ember-mocha-adapter',   target: '~0.3.1' },
       { name: 'ember-cli-test-loader', source: 'ember-cli-test-loader', target: '0.2.2'  }
     ]).then(function() {
diff --git a/bower.json b/bower.json
index 64f17f6..0f1d0d8 100644
--- a/bower.json
+++ b/bower.json
@@ -5,8 +5,6 @@
     "ember-cli-shims": "0.1.1",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
-    "mocha": "~2.4.5",
-    "chai": "~2.3.0",
     "ember-mocha-adapter": "~0.3.1"
   }
 }
diff --git a/index.js b/index.js
index 54902d5..e28a311 100644
--- a/index.js
+++ b/index.js
@@ -96,6 +96,20 @@ module.exports = {
   },
 
   treeForVendor: function(tree) {
+    var mochaPath = path.dirname(resolve.sync('mocha'));
+    // var mochaTree = this.treeGenerator(mochaPath);
+    var mochaTree = new Funnel(mochaPath, {
+      files: ['mocha.js', 'mocha.css'],
+      destDir: '/mocha',
+    });
+
+    var chaiPath = path.dirname(resolve.sync('chai'));
+    // var chaiTree = this.treeGenerator(chaiPath);
+    var chaiTree = new Funnel(chaiPath, {
+      files: ['chai.js'],
+      destDir: '/chai',
+    });
+
     var emberMochaBuildSupportPath = path.join(this._emberMochaLibPath, '..', 'build-support');
 
     var mochaSetupTree = new Funnel(emberMochaBuildSupportPath, {
@@ -105,6 +119,8 @@ module.exports = {
 
     var trees = [
       tree,
+      mochaTree,
+      chaiTree,
       mochaSetupTree
     ];
 
@@ -146,9 +162,9 @@ module.exports = {
 
     if (app.tests) {
       var fileAssets = [
-        app.bowerDirectory + '/mocha/mocha.js',
-        app.bowerDirectory + '/mocha/mocha.css',
-        app.bowerDirectory + '/chai/chai.js',
+        'vendor/mocha/mocha.js',
+        'vendor/mocha/mocha.css',
+        'vendor/chai/chai.js',
         'vendor/ember-mocha/mocha-setup.js',
         app.bowerDirectory + '/ember-mocha-adapter/adapter.js',
         'vendor/ember-cli-mocha/test-loader.js'
diff --git a/package.json b/package.json
index 95d0410..e0c69a4 100644
--- a/package.json
+++ b/package.json
@@ -63,10 +63,12 @@
     "broccoli-concat": "^2.1.0",
     "broccoli-funnel": "^1.0.1",
     "broccoli-merge-trees": "^1.1.1",
+    "chai": "^3.5.0",
     "ember-cli-babel": "^5.1.6",
     "ember-cli-version-checker": "^1.1.6",
     "ember-mocha": "^0.8.11",
     "exists-sync": "0.0.3",
+    "mocha": "^2.5.3",
     "resolve": "^1.1.7"
   }
 }