diff --git a/gulpfile.js b/gulpfile.js
index cfb10a3e9e..5e80d67471 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,5 +7,11 @@
  */
 
 require('babel/register');
-require('glob').sync('./tasks/gulp-*').forEach(require);
-require('gulp').task('default', ['test']);
+
+if (process.env.NODE_ENV === 'production') {
+  require('./tasks/gulp-newstuff');
+  require('./tasks/gulp-build');
+} else {
+  require('glob').sync('./tasks/gulp-*').forEach(require);
+  require('gulp').task('default', ['test']);
+}
diff --git a/package.json b/package.json
index 407a2a36ff..20bb60b471 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
     "domain-middleware": "~0.1.0",
     "express": "~3.17.5",
     "express-csv": "~0.6.0",
-    "glob": "^4.3.5",
     "grunt": "~0.4.1",
     "grunt-browserify": "^3.3.0",
     "grunt-cli": "~0.1.9",
@@ -93,6 +92,7 @@
     "deep-diff": "~0.1.4",
     "event-stream": "^3.2.2",
     "expect.js": "~0.2.0",
+    "glob": "^4.3.5",
     "grunt-contrib-imagemin": "^0.9.4",
     "istanbul": "^0.3.14",
     "karma": "~0.10.2",