diff --git a/.github/scripts/run-bazel-ci.sh b/.github/scripts/run-bazel-ci.sh
index c2b53bd652..8a3287eef9 100755
--- a/.github/scripts/run-bazel-ci.sh
+++ b/.github/scripts/run-bazel-ci.sh
@@ -286,7 +286,7 @@ if [[ "${RUNNER_OS:-}" == "Windows" && -n "${BUILDBUDDY_API_KEY:-}" && ( $window
   fi
 fi
 
-if [[ "${RUNNER_OS:-}" == "Windows" && ! ( -n "${BUILDBUDDY_API_KEY:-}" && ( $windows_cross_compile -eq 1 || "$ci_config" == "ci-windows-argument-lint" ) ) ]]; then
+if [[ "${RUNNER_OS:-}" == "Windows" && ! ( -n "${BUILDBUDDY_API_KEY:-}" && ( $windows_cross_compile -eq 1 || $windows_hybrid_execution -eq 1 ) ) ]]; then
   post_config_bazel_args+=("--shell_executable=${BAZEL_SH}")
 fi
 
diff --git a/.github/scripts/test_run_bazel_with_buildbuddy.py b/.github/scripts/test_run_bazel_with_buildbuddy.py
index 76bc924248..9ba47626b8 100644
--- a/.github/scripts/test_run_bazel_with_buildbuddy.py
+++ b/.github/scripts/test_run_bazel_with_buildbuddy.py
@@ -239,7 +239,10 @@ class RunBazelWithBuildBuddyTest(unittest.TestCase):
                 "//codex-rs/arg0:arg0",
             )
             self.assertIn("--config=ci-windows-hybrid", command)
-            self.assertIn("--shell_executable=/bin/bash", command)
+            self.assertEqual(
+                [arg for arg in command if arg.startswith("--shell_executable=")],
+                ["--shell_executable=/bin/bash"],
+            )
             self.assertIn("--action_env=PATH=/usr/bin:/bin", command)
             self.assertIn("--host_action_env=PATH=/usr/bin:/bin", command)
             self.assertIn(r"--test_env=PATH=C:\runtime\bin", command)