diff --git a/.buildkite/ci.mjs b/.buildkite/ci.mjs
index 9f39a72a3d..3fb1e643f3 100755
--- a/.buildkite/ci.mjs
+++ b/.buildkite/ci.mjs
@@ -543,9 +543,8 @@ function getTestBunStep(platform, options, testOptions = {}) {
     label: `${getPlatformLabel(platform)} - test-bun`,
     depends_on: depends,
     agents: getTestAgent(platform, options),
-    cancel_on_build_failing: isMergeQueue(),
     retry: getRetry(),
-    soft_fail: isMainBranch() ? true : [{ exit_status: 2 }],
+    cancel_on_build_failing: isMergeQueue(),
     parallelism: unifiedTests ? undefined : os === "darwin" ? 2 : 10,
     command:
       os === "windows"
@@ -590,6 +589,7 @@ function getBuildImageStep(platform, options) {
       DEBUG: "1",
     },
     retry: getRetry(),
+    cancel_on_build_failing: isMergeQueue(),
     command: command.filter(Boolean).join(" "),
     timeout_in_minutes: 3 * 60,
   };
diff --git a/scripts/check-node.sh b/scripts/check-node.sh
index 39624e8278..47c2787186 100755
--- a/scripts/check-node.sh
+++ b/scripts/check-node.sh
@@ -1,8 +1,28 @@
 #!/bin/bash
 
+# How to use this script:
+# 1. Pick a module from node's standard library (e.g. 'assert', 'fs')
+# 2. Copy over relevant tests from node's parallel test suite into test/js/node/test/parallel
+# 3. Run this script, e.g. `./scripts/check-node.sh fs`
+# 4. Tests that passed get staged for commit
+
 i=0
 j=0
 
+if [[ -z $1 ]]
+then
+  echo "Usage: $0 <module-name>"
+  exit 1
+fi
+
+case $1 in
+  -h|--help)
+    echo "Usage: $0 <module-name>"
+    echo "Run all parallel tests for a single module in node's standard library"
+    exit 0
+    ;;
+esac
+
 export BUN_DEBUG_QUIET_LOGS=1
 export NO_COLOR=1