diff --git a/package.json b/package.json
index 92d3e6bc39..283ba5852d 100644
--- a/package.json
+++ b/package.json
@@ -122,6 +122,7 @@
     "protractor": "~2.5.1",
     "rewire": "^2.3.3",
     "rimraf": "^2.4.3",
+    "run-sequence": "^1.1.4",
     "shelljs": "^0.4.0",
     "sinon": "^1.17.2",
     "sinon-chai": "^2.8.0",
diff --git a/tasks/gulp-tests.js b/tasks/gulp-tests.js
index 3979cbd52b..0187773824 100644
--- a/tasks/gulp-tests.js
+++ b/tasks/gulp-tests.js
@@ -10,6 +10,7 @@ import { exec }                   from 'child_process';
 import psTree                     from 'ps-tree';
 import gulp                       from 'gulp';
 import Q                          from 'q';
+import runSequence                from 'run-sequence';
 
 const TEST_SERVER_PORT  = 3003
 const TEST_DB           = 'habitrpg_test'
@@ -368,17 +369,21 @@ gulp.task('test:api-v3:safe', ['test:prepare:server'], (done) => {
   });
 });
 
-gulp.task('test', [
+gulp.task('test:all', (done) => {
+  runSequence(
   'lint',
-  //'test:e2e:safe',
+  // 'test:e2e:safe',
   'test:common:safe',
   // 'test:content:safe',
   'test:server_side:safe',
-  //'test:karma:safe',
-  //'test:api-legacy:safe',
-  //'test:api-v2:safe',
+  // 'test:karma:safe',
+  // 'test:api-legacy:safe',
+  // 'test:api-v2:safe',
   'test:api-v3:safe',
-], () => {
+  done);
+});
+
+gulp.task('test', ['test:all'], () => {
   let totals = [0,0,0];
 
   console.log('\n\x1b[36m\x1b[4mHabitica Test Summary\x1b[0m\n');