diff --git a/Gruntfile.js b/Gruntfile.js
index 91469b5c1c..f95f384d66 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,7 +18,7 @@ var _              = require('lodash'),
     cwd            = process.cwd().replace(/( |\(|\))/g, escapeChar + '$1'),
     buildDirectory = path.resolve(cwd, '.build'),
     distDirectory  = path.resolve(cwd, '.dist'),
-    mochaPath      = path.resolve(cwd + '/node_modules/grunt-mocha-cli/node_modules/mocha/bin/mocha'),
+    mochaPath      = path.resolve(cwd + '/node_modules/.bin/mocha'),
     emberPath      = path.resolve(cwd + '/core/client/node_modules/.bin/ember'),
 
     // ## Grunt configuration
diff --git a/package.json b/package.json
index 40c46fa207..e92b56b4e7 100644
--- a/package.json
+++ b/package.json
@@ -76,23 +76,23 @@
   "devDependencies": {
     "bower": "1.4.1",
     "csscomb": "3.1.8",
-    "grunt": "0.4.5",
-    "grunt-bg-shell": "2.3.1",
-    "grunt-cli": "0.1.13",
-    "grunt-contrib-clean": "0.7.0",
-    "grunt-contrib-compress": "0.14.0",
-    "grunt-contrib-copy": "0.8.2",
-    "grunt-contrib-jshint": "0.12.0",
+    "grunt": "1.0.1",
+    "grunt-bg-shell": "2.3.3",
+    "grunt-cli": "1.2.0",
+    "grunt-contrib-clean": "1.0.0",
+    "grunt-contrib-compress": "1.2.0",
+    "grunt-contrib-copy": "1.0.0",
+    "grunt-contrib-jshint": "1.0.0",
     "grunt-contrib-uglify": "1.0.1",
-    "grunt-contrib-watch": "0.6.1",
-    "grunt-docker": "0.0.10",
-    "grunt-express-server": "0.5.1",
-    "grunt-jscs": "2.7.0",
-    "grunt-mocha-cli": "2.0.0",
-    "grunt-mocha-istanbul": "3.0.1",
-    "grunt-shell": "1.1.2",
+    "grunt-contrib-watch": "1.0.0",
+    "grunt-docker": "0.0.11",
+    "grunt-express-server": "0.5.3",
+    "grunt-jscs": "2.8.0",
+    "grunt-mocha-cli": "2.1.0",
+    "grunt-mocha-istanbul": "4.0.2",
+    "grunt-shell": "1.3.0",
     "grunt-update-submodules": "0.4.1",
-    "istanbul": "0.4.2",
+    "istanbul": "0.4.3",
     "jscs-jsdoc": "1.3.1",
     "matchdep": "1.0.0",
     "mocha": "2.4.5",