diff --git a/envsetup.sh b/envsetup.sh
index 3f5ce330a8..852352d316 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1849,7 +1849,7 @@ function b()
         fi
     done
     # Generate BUILD, bzl files into the synthetic Bazel workspace (out/soong/workspace).
-    _trigger_build "all-modules" bp2build USE_BAZEL_ANALYSIS= || return 1
+    _trigger_build "all-modules" bp2build $skip_tests USE_BAZEL_ANALYSIS= || return 1
     # Then, run Bazel using the synthetic workspace as the --package_path.
     if [[ -z "$bazel_args" ]]; then
         # If there are no args, show help.