diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe6dba4f95..4b632a19cc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -74,14 +74,11 @@ jobs:
       - run: ls /home/circleci/bazel_repository_cache || true
       - run: bazel info release
       - run: bazel run @yarn//:yarn
-      # We could use bazel query so that we explicitly ask for all buildable targets to be built as well
-      # This would avoid waiting for a build command to finish before running the first test
+      # Use bazel query so that we explicitly ask for all buildable targets to be built as well
+      # This avoids waiting for the slowest build target to finish before running the first test
       # See https://github.com/bazelbuild/bazel/issues/4257
-      # - run: bazel query --output=label //... | xargs bazel test
-      # However it makes it more confusing for Angular developers who are still novice at Bazel
-      # So keep it simple for now
-      - run: bazel build //...
-      - run: bazel test //...
+      # NOTE: Angular developers should typically just bazel build //packages/... or bazel test //packages/...
+      - run: bazel query --output=label //... | xargs bazel test
 
       # CircleCI will allow us to go back and view/download these artifacts from past builds.
       # Also we can use a service like https://buildsize.org/ to automatically track binary size of these artifacts.