diff --git a/karma-js.conf.js b/karma-js.conf.js
index 7934b136a3..35fbdae03f 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -41,7 +41,7 @@ module.exports = function(config) {
       'node_modules/reflect-metadata/Reflect.js',
       'tools/build/file2modulename.js',
       'test-main.js',
-      {pattern: 'dist/all/empty.*', included: false, watched: false},
+      {pattern: 'dist/all/@angular/empty.*', included: false, watched: false},
       {pattern: 'packages/platform-browser/test/static_assets/**', included: false, watched: false},
       {
         pattern: 'packages/platform-browser/test/browser/static_assets/**',
diff --git a/test-main.js b/test-main.js
index 1627fbd7fd..a99be131d4 100644
--- a/test-main.js
+++ b/test-main.js
@@ -22,9 +22,9 @@ System.config({
     'benchpress/*': 'dist/js/dev/es5/benchpress/*.js',
     '@angular': 'dist/all/@angular',
     'rxjs': 'node_modules/rxjs',
-    'parse5': 'dist/all/empty.js',
-    'url': 'dist/all/empty.js',
-    'xhr2': 'dist/all/empty.js',
+    'parse5': 'dist/all/@angular/empty.js',
+    'url': 'dist/all/@angular/empty.js',
+    'xhr2': 'dist/all/@angular/empty.js',
     '@angular/platform-server/src/parse5_adapter': 'dist/all/empty.js',
     'angular2/*': 'dist/all/angular2/*.js',
     'angular2/src/alt_router/router_testing_providers':