diff --git a/Gruntfile.js b/Gruntfile.js
index 0f2eb6171a..8a9e1870f7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -370,6 +370,9 @@ var _              = require('lodash'),
                 },
                 tmp: {
                     src: ['.tmp/**']
+                },
+                dependencies: {
+                    src: ['node_modules/**', 'core/client/bower_components/**', 'core/client/node_modules/**']
                 }
             },
 
@@ -699,8 +702,8 @@ var _              = require('lodash'),
 
         // ### Ember unit tests *(sub task)*
         // `grunt testem` will run just the ember unit tests
-        grunt.registerTask('testem', 'Run the ember unit tests',
-            ['test-setup', 'shell:testem']
+        grunt.registerTask('test-ember', 'Run the ember unit tests',
+            ['test-setup', 'shell:ember:test']
         );
 
         // ### Functional tests *(sub task)*