diff --git a/gulpfile.js b/gulpfile.js
index 90701ea9b1..ee220cb7c3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -247,6 +247,16 @@ gulp.task('serve.js.dev', ['build.js.dev'], function(neverDone) {
   })();
 });
 
+gulp.task('serve.e2e.dev', ['build.js.dev', 'build.js.cjs', 'build.css.material'], function(neverDone) {
+  watch('modules/**', { ignoreInitial: true }, '!broccoli.js.dev');
+  watch('modules/**', { ignoreInitial: true }, '!build.js.cjs');
+
+  jsserve(gulp, gulpPlugins, {
+    path: CONFIG.dest.js.dev.es5,
+    port: 8000
+  })();
+});
+
 gulp.task('serve.js.prod', jsserve(gulp, gulpPlugins, {
   path: CONFIG.dest.js.prod.es5,
   port: 8001
diff --git a/protractor-js-dev.conf.js b/protractor-js-dev.conf.js
new file mode 100644
index 0000000000..8a9eb0644e
--- /dev/null
+++ b/protractor-js-dev.conf.js
@@ -0,0 +1,3 @@
+var data = module.exports = require('./protractor-shared.js');
+var config = data.config;
+config.baseUrl = 'http://localhost:8000/';
diff --git a/tools/broccoli/trees/browser_tree.ts b/tools/broccoli/trees/browser_tree.ts
index faf4a181df..f81601265a 100644
--- a/tools/broccoli/trees/browser_tree.ts
+++ b/tools/broccoli/trees/browser_tree.ts
@@ -178,11 +178,8 @@ module.exports = function makeBrowserTree(options, destinationPath) {
     ]
   });
 
-  var assetsTree = new Funnel(modulesTree,{
-    include: ['**/*'],
-    exclude: ['**/*.{html,ts,dart}'],
-    destDir: '/'
-  });
+  var assetsTree =
+      new Funnel(modulesTree, {include: ['**/*'], exclude: ['**/*.{html,ts,dart}'], destDir: '/'});
 
   var scripts = mergeTrees(servingTrees);
   var polymerFiles = new Funnel('.', {