diff --git a/gulpfile.js b/gulpfile.js
index ceeab61a25..348228e135 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -559,6 +559,20 @@ gulp.task('test.transpiler.unittest', function(done) {
   runJasmineTests(['tools/transpiler/unittest/**/*.js'], done);
 });
 
+
+// -----------------
+// Pre/Post-test checks
+
+gulp.task('pre-test-checks', function(done) {
+  runSequence('build/checkCircularDependencies', sequenceComplete(done));
+});
+
+
+gulp.task('post-test-checks', function(done) {
+  runSequence('enforce-format', sequenceComplete(done));
+});
+
+
 // -----------------
 // orchestrated targets
 
@@ -686,8 +700,6 @@ gulp.task('!broccoli.js.prod', function() {
 gulp.task('build.js.dev', ['build/clean.js'], function(done) {
   runSequence(
     'broccoli.js.dev',
-    'build/checkCircularDependencies',
-    'check-format',
     sequenceComplete(done)
   );
 });
diff --git a/scripts/ci/build_js.sh b/scripts/ci/build_js.sh
index 9d06062a7f..3217d17f73 100755
--- a/scripts/ci/build_js.sh
+++ b/scripts/ci/build_js.sh
@@ -8,6 +8,5 @@ SCRIPT_DIR=$(dirname $0)
 source $SCRIPT_DIR/env_dart.sh
 cd $SCRIPT_DIR/../..
 
-./node_modules/.bin/gulp enforce-format
 ./node_modules/.bin/gulp build.js
 ./node_modules/.bin/gulp docs
diff --git a/scripts/ci/test_js.sh b/scripts/ci/test_js.sh
index 5cd966bfc3..17433d11db 100755
--- a/scripts/ci/test_js.sh
+++ b/scripts/ci/test_js.sh
@@ -12,5 +12,7 @@ if  ${SCRIPT_DIR}/env_dart.sh 2>&1 > /dev/null ; then
     source $SCRIPT_DIR/env_dart.sh
 fi
 
+./node_modules/.bin/gulp pre-test-checks
 ./node_modules/.bin/gulp test.js --browsers=${KARMA_BROWSERS:-ChromeCanary}
 ${SCRIPT_DIR}/test_e2e_js.sh
+./node_modules/.bin/gulp post-test-checks