diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f7b2f8ffd0..377dd5adac 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -132,8 +132,9 @@ steps:
           DEBUG: "pw:browser"
         if: (build.branch == 'trunk' || build.tag =~ /^v[0-9]+/ || !build.pull_request.draft) && !(build.pull_request.labels includes 'native-php')
 
-  # No `if:` guard: a required status check must report on every build, or PRs
-  # that skip it hang waiting for it. Doc-only PRs exit early but still report.
+  # The `if:` guards below stop the required `CLI E2E Tests` status reporting on
+  # drafts, which is only safe while draft-ness is the condition: a PR has to be
+  # marked ready to merge, and that transition builds again and reports.
   - group: CLI E2E Tests
     key: cli-e2e-tests
     notify:
@@ -150,6 +151,7 @@ steps:
         matrix:
           - mac
           - windows
+        if: build.branch == 'trunk' || build.tag =~ /^v[0-9]+/ || !build.pull_request.draft
 
       # Separate from the matrix above: Mac and Windows share queue/plugin
       # defaults that Linux doesn't. Same pattern as the unit-test group.
@@ -164,6 +166,7 @@ steps:
               image: "$NODE_DOCKER_IMAGE"
               propagate-environment: true
               mount-buildkite-agent: true
+        if: build.branch == 'trunk' || build.tag =~ /^v[0-9]+/ || !build.pull_request.draft
 
   - label: ":chart_with_upwards_trend: Performance Metrics"
     key: metrics