diff --git a/.travis.yml b/.travis.yml
index daac9aad0..76950271a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,9 @@ jobs:
     include:
     - env: NPM_SCRIPT=lint
       node_js: 8
+    - env: NPM_SCRIPT=build
+      node_js: 8
+      if: not (branch in (master, develop) and type != pull_request)
     - stage: release
       node_js: 8
       env: NPM_SCRIPT=build
diff --git a/webpack.config.js b/webpack.config.js
index d87ece7bf..c10b1d11b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -121,10 +121,6 @@ module.exports = [
                     test: require.resolve('stats.js/build/stats.min.js'),
                     loader: 'script-loader'
                 },
-                {
-                    test: require.resolve('highlightjs/highlight.pack.min.js'),
-                    loader: 'script-loader'
-                },
                 {
                     test: require.resolve('scratch-blocks/dist/vertical.js'),
                     loader: 'expose-loader?Blockly'