diff --git a/gulpfile.js b/gulpfile.js
index 41819dd561..33aaac72ad 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -694,7 +694,8 @@ gulp.task('karma', ['tests'], function() {
   return karma.start({ configFile: __dirname + '/scripts/karma/karma.conf.js' })
 });
 
-gulp.task('karma-watch', ['watch.tests', 'watch'], function() {
+gulp.task('karma-watch', ['watch.tests', 'bundle.system'], function() {
+  watchTask('bundle.system');
   var karma = require('karma').server;
   return karma.start({ configFile: __dirname + '/scripts/karma/karma-watch.conf.js' })
 });
diff --git a/scripts/karma/karma.conf.js b/scripts/karma/karma.conf.js
index e13378d7f0..e2ddc4b2ea 100644
--- a/scripts/karma/karma.conf.js
+++ b/scripts/karma/karma.conf.js
@@ -22,7 +22,6 @@ module.exports = function(config) {
       'dist/bundles/ionic.system.js',
       //'node_modules/angular2/bundles/test_lib.js',
       { pattern: 'dist/tests/**/*.spec.js', included: false },
-      { pattern: 'dist/**/*.js', included: false, served: false },
       'scripts/karma/test-main.js'
     ],