diff --git a/buildkite/bazelci.py b/buildkite/bazelci.py
index 311ac53..0d567f6 100644
--- a/buildkite/bazelci.py
+++ b/buildkite/bazelci.py
@@ -951,12 +951,12 @@
         pipeline_steps.append(bazel_build_step(
             platform, "Bazel", http_config, file_config, build_only=True))
 
+    pipeline_steps.append(wait_step())
+
     for platform, config in configs.items():
         pipeline_steps.append(bazel_build_step(
             platform, "Bazel", http_config, file_config, test_only=True))
 
-    pipeline_steps.append(wait_step())
-
     # If all builds and tests pass, publish the Bazel binaries
     # to GCS.
     pipeline_steps.append(publish_bazel_binaries_step())