diff --git a/scripts/pr b/scripts/pr
index 5e73cf93b65..dc0f4e2fc57 100755
--- a/scripts/pr
+++ b/scripts/pr
@@ -1384,7 +1384,6 @@ validate_changelog_merge_hygiene() {
 
 prepare_gates() {
   local pr="$1"
-  local skip_test="${2:-false}"
   enter_worktree "$pr" false
 
   checkout_prep_branch "$pr"
@@ -1419,9 +1418,7 @@ prepare_gates() {
   run_quiet_logged "pnpm build" ".local/gates-build.log" pnpm build
   run_quiet_logged "pnpm check" ".local/gates-check.log" pnpm check
 
-  if [ "$skip_test" = "true" ]; then
-    echo "Test skipped (--no-test). Full suite deferred to Test phase."
-  elif [ "$docs_only" = "true" ]; then
+  if [ "$docs_only" = "true" ]; then
     echo "Docs-only change detected with high confidence; skipping pnpm test."
   else
     run_quiet_logged "pnpm test" ".local/gates-test.log" pnpm test
@@ -1990,7 +1987,7 @@ main() {
       prepare_validate_commit "$pr"
       ;;
     prepare-gates)
-      prepare_gates "$pr" "${3:-false}"
+      prepare_gates "$pr"
       ;;
     prepare-push)
       prepare_push "$pr"
diff --git a/scripts/pr-prepare b/scripts/pr-prepare
index 93a56845843..98f55df4f17 100755
--- a/scripts/pr-prepare
+++ b/scripts/pr-prepare
@@ -1,20 +1,13 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-if [ "$#" -lt 2 ]; then
-  echo "Usage: scripts/pr-prepare <init|validate-commit|gates|push|run> <PR> [--no-test]"
+if [ "$#" -ne 2 ]; then
+  echo "Usage: scripts/pr-prepare <init|validate-commit|gates|push|run> <PR>"
   exit 2
 fi
 
 mode="$1"
 pr="$2"
-shift 2
-no_test=false
-for arg in "$@"; do
-  case "$arg" in
-    --no-test) no_test=true ;;
-  esac
-done
 script_dir="$(cd "$(dirname "$0")" && pwd)"
 base="$script_dir/pr"
 if common_git_dir=$(git -C "$script_dir" rev-parse --path-format=absolute --git-common-dir 2>/dev/null); then
@@ -32,11 +25,7 @@ case "$mode" in
     exec "$base" prepare-validate-commit "$pr"
     ;;
   gates)
-    if [ "$no_test" = "true" ]; then
-      exec "$base" prepare-gates "$pr" true
-    else
-      exec "$base" prepare-gates "$pr"
-    fi
+    exec "$base" prepare-gates "$pr"
     ;;
   push)
     exec "$base" prepare-push "$pr"