diff --git a/src/ci/docker/scripts/stage_2_test_set1.sh b/src/ci/docker/scripts/stage_2_test_set1.sh
index 3baff4b52215a..ce33c6d72d673 100755
--- a/src/ci/docker/scripts/stage_2_test_set1.sh
+++ b/src/ci/docker/scripts/stage_2_test_set1.sh
@@ -4,6 +4,15 @@ set -ex
 
 # Run a subset of tests. Used to run tests in parallel in multiple jobs.
 
+# When this job partition is run as part of PR CI, skip tidy to allow revealing more failures. The
+# dedicated `tidy` job failing won't block other PR CI jobs from completing, and so tidy failures
+# shouldn't inhibit revealing other failures in PR CI jobs.
+if [ "$PR_CI_JOB" == "1" ]; then
+  echo "PR_CI_JOB set; skipping tidy"
+  SKIP_TIDY="--skip tidy"
+fi
+
 ../x.py --stage 2 test \
+  ${SKIP_TIDY:+$SKIP_TIDY} \
   --skip compiler \
   --skip src
diff --git a/src/ci/docker/scripts/stage_2_test_set2.sh b/src/ci/docker/scripts/stage_2_test_set2.sh
index 872d758dce381..06b80b200a8c0 100755
--- a/src/ci/docker/scripts/stage_2_test_set2.sh
+++ b/src/ci/docker/scripts/stage_2_test_set2.sh
@@ -4,7 +4,16 @@ set -ex
 
 # Run a subset of tests. Used to run tests in parallel in multiple jobs.
 
+# When this job partition is run as part of PR CI, skip tidy to allow revealing more failures. The
+# dedicated `tidy` job failing won't block other PR CI jobs from completing, and so tidy failures
+# shouldn't inhibit revealing other failures in PR CI jobs.
+if [ "$PR_CI_JOB" == "1" ]; then
+  echo "PR_CI_JOB set; skipping tidy"
+  SKIP_TIDY="--skip tidy"
+fi
+
 ../x.py --stage 2 test \
+  ${SKIP_TIDY:+$SKIP_TIDY} \
   --skip tests \
   --skip coverage-map \
   --skip coverage-run \