diff --git a/gulp-tasks/test.js b/gulp-tasks/test.js
index d626cd571..beb0e9088 100644
--- a/gulp-tasks/test.js
+++ b/gulp-tasks/test.js
@@ -11,9 +11,22 @@ const {parallel, series} = require('gulp');
 const {lint} = require('./lint');
 const {test_integration} = require('./test-integration');
 const {test_node} = require('./test-node');
+const logHelper = require('../infra/utils/log-helper');
+
+async function logSkip() {
+  logHelper.log('Skipping test suite due to --skipTests');
+}
+
+function runTestsUnlessSkipped() {
+  if (global.cliOptions.skipTests) {
+    return logSkip;
+  } else {
+    // The node and integration tests both muck with process.env.NODE_ENV,
+    // and therefore can't be run in parallel.
+    return parallel(lint, series(test_node, test_integration));
+  }
+}
 
 module.exports = {
-  // The node and integration tests both muck with process.env.NODE_ENV, and
-  // therefore can't be run in parallel.
-  test: parallel(lint, series(test_node, test_integration)),
+  test: runTestsUnlessSkipped(),
 };