diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 19772adebc7..e8b3195bee4 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -42,7 +42,7 @@ set -e
 echo "" > coverage.txt
 
 for d in $(go list ./pkg/...); do
-  exit_if_fail go test -race -coverprofile=profile.out -covermode=atomic $d
+  exit_if_fail go test -coverprofile=profile.out -covermode=atomic $d
   if [ -f profile.out ]; then
     cat profile.out >> coverage.txt
     rm profile.out
diff --git a/scripts/grunt/build_task.js b/scripts/grunt/build_task.js
index 668a67d2227..ca64c8d6fbf 100644
--- a/scripts/grunt/build_task.js
+++ b/scripts/grunt/build_task.js
@@ -7,7 +7,7 @@ module.exports = function(grunt) {
     'clean:release',
     'clean:build',
     'phantomjs',
-    'webpack:prod',
+    'exec:webpack',
   ]);
 
 };
diff --git a/scripts/grunt/options/exec.js b/scripts/grunt/options/exec.js
index 9e5a971bdf7..cf18adfca8c 100644
--- a/scripts/grunt/options/exec.js
+++ b/scripts/grunt/options/exec.js
@@ -7,7 +7,8 @@ module.exports = function(config, grunt) {
   }
 
   return {
-    tslint : "node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json",
-    jest : "node ./node_modules/jest-cli/bin/jest.js " + coverage,
+    tslint:     "node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json",
+    jest:       "node ./node_modules/jest-cli/bin/jest.js " + coverage,
+    "webpack":  "./node_modules/.bin/webpack --config scripts/webpack/webpack.prod.js",
   };
 };
diff --git a/scripts/grunt/options/webpack.js b/scripts/grunt/options/webpack.js
index be1f651cfd0..1f512fad8f3 100644
--- a/scripts/grunt/options/webpack.js
+++ b/scripts/grunt/options/webpack.js
@@ -5,7 +5,7 @@ module.exports = function() {
   'use strict';
   return {
     options: {
-      stats: !process.env.NODE_ENV || process.env.NODE_ENV === 'development'
+      stats: false,
     },
     dev: dev,
     prod: prod
diff --git a/scripts/webpack/webpack.prod.js b/scripts/webpack/webpack.prod.js
index 31fed77d749..01be6e0ea18 100644
--- a/scripts/webpack/webpack.prod.js
+++ b/scripts/webpack/webpack.prod.js
@@ -27,7 +27,10 @@ module.exports = merge(common, {
   },
 
   devServer: {
-    stats: 'errors-only',
+    noInfo: true,
+    stats: {
+      chunks: false,
+    },
   },
 
   plugins: [