diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
index 4c18bff974..a5a23eb41b 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/test.js
@@ -9,7 +9,10 @@ var karmaServer = require('karma').Server;
  **************************/
 
  // Karma test
-gulp.task('test:unit', function() {
+gulp.task('runTests', ["js", "test:unit"]);
+
+gulp.task('test:unit', function () {
+
     new karmaServer({
         configFile: __dirname + "/../../test/config/karma.conf.js",
         keepalive: true
diff --git a/src/Umbraco.Web.UI.Client/test/config/app.unit.js b/src/Umbraco.Web.UI.Client/test/config/app.unit.js
index 1369ad2145..32b05ab0d4 100644
--- a/src/Umbraco.Web.UI.Client/test/config/app.unit.js
+++ b/src/Umbraco.Web.UI.Client/test/config/app.unit.js
@@ -1,12 +1,20 @@
 var app = angular.module('umbraco', [
-	'umbraco.filters',
-	'umbraco.directives',
-	'umbraco.resources',
-	'umbraco.services',
+    'umbraco.filters',
+    'umbraco.directives',
+    'umbraco.resources',
+    'umbraco.services',
+    
 	'umbraco.mocks',
 	'umbraco.interceptors',
 
     'ngRoute',
+    'ngAnimate',
     'ngCookies',
-    'LocalStorageModule'
+    'ngSanitize',
+    
+    //'ngMessages',
+    'tmh.dynamicLocale',
+    //'ngFileUpload',
+    //'LocalStorageModule',
+    //'chart.js'
 ]);
diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
index 07aa9935a8..cfb4eddb40 100644
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
@@ -24,17 +24,19 @@ module.exports = function (config) {
             'node_modules/moment/min/moment-with-locales.js',
             'lib/umbraco/Extensions.js',
             'node_modules/lazyload-js/lazyload.min.js',
+            'node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.min.js',
 
             //app bootstrap and loader
             'test/config/app.unit.js',
 
             //application files
-            'src/common/directives/*.js',
-            'src/common/filters/*.js',
-            'src/common/services/*.js',
-            'src/common/interceptors/*.js',
-            'src/common/resources/*.js',
-            'src/views/**/*.controller.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.controllers.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.directives.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.filters.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.services.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.interceptors.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.security.js',
+            '../Umbraco.Web.UI/Umbraco/js/*.resources.js',
 
             //mocked data and routing
             'src/common/mocks/umbraco.servervariables.js',