diff --git a/Gruntfile.js b/Gruntfile.js
index 68e0021..ce0b9bb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -35,14 +35,14 @@ module.exports = function (grunt) {
       },
       js: {
         files: ['<%= yeoman.app %>/**/*.js', '!<%= yeoman.app %>/**/*_test.js'],
-        tasks: ['karma:continuous:run'], //'newer:jshint:all'],
+        tasks: ['karma:continuous:run'],
         options: {
           livereload: '<%= connect.options.livereload %>'
         }
       },
       jsTest: {
         files: ['<%= yeoman.app %>/**/*_test.js'],
-        tasks: ['karma:continuous:run'], //'newer:jshint:test']
+        tasks: ['karma:continuous:run'],
       },
       styles: {
         files: ['<%= yeoman.app %>/styles/{,*/}*.css'],
@@ -92,7 +92,6 @@ module.exports = function (grunt) {
         middleware: function (connect) {
           return [
             connect.static('.tmp'),
-            //connect.static('test'),
             connect().use(
               '/bower_components',
               connect.static('./bower_components')
@@ -144,6 +143,21 @@ module.exports = function (grunt) {
       app: {
         src: ['<%= yeoman.app %>/index.html'],
         ignorePath: /\.\.\//
+      },
+      test: {
+        src: 'karma.conf.js',
+        fileTypes: {
+          js: {
+            block: /(([\s\t]*)\/\/\s*bower:*(\S*))(\n|\r|.)*?(\/\/\s*endbower)/gi,
+            detect: {
+                js: /'(.*\.js)'/gi
+            },
+            replace: {
+                js: '\'{{filePath}}\','
+            }
+          }
+        },
+        devDependencies: true
       }
     },
 
diff --git a/karma.conf.js b/karma.conf.js
index 3b10a3f..3841fc9 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -8,7 +8,7 @@ module.exports = function(config) {
 
   config.set({
     // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: true,
+    autoWatch: false,
 
     // base path, that will be used to resolve files and exclude
     basePath: '.',
@@ -18,9 +18,9 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
+      // bower:
       'bower_components/jquery/jquery.js',
       'bower_components/angular/angular.js',
-      'bower_components/angular-mocks/angular-mocks.js',
       'bower_components/angular-route/angular-route.js',
       'bower_components/angular-sanitize/angular-sanitize.js',
       'bower_components/angular-cookies/angular-cookies.js',
@@ -32,7 +32,10 @@ module.exports = function(config) {
       'bower_components/jquery.scrollTo/jquery.scrollTo.js',
       'bower_components/underscore/underscore.js',
       'bower_components/angular-underscore/angular-underscore.js',
-      'bower_components/jasmine-promise-matchers/src/main.js',
+      'bower_components/angular-mocks/angular-mocks.js',
+      'bower_components/angular-scenario/angular-scenario.js',
+      'bower_components/jasmine-promise-matchers/dist/jasmine-promise-matchers.js',
+      // endbower
       'app/**/*.js',
       'app/**/*_test.js'
     ],