diff --git a/codex-rs/cli/BUILD.bazel b/codex-rs/cli/BUILD.bazel
index 9938897f6d..ce49f4b2e5 100644
--- a/codex-rs/cli/BUILD.bazel
+++ b/codex-rs/cli/BUILD.bazel
@@ -9,6 +9,7 @@ codex_rust_crate(
         "//codex-rs/bwrap:bwrap",
     ],
     rustc_flags_extra = MACOS_WEBRTC_RUSTC_LINK_FLAGS,
+    test_data_extra = glob(["src/**/snapshots/**"]),
 )
 
 multiplatform_binaries(
diff --git a/codex-rs/cli/src/main.rs b/codex-rs/cli/src/main.rs
index 45817bd95b..c01a94b2d3 100644
--- a/codex-rs/cli/src/main.rs
+++ b/codex-rs/cli/src/main.rs
@@ -3066,9 +3066,10 @@ mod tests {
 
     #[test]
     fn delete_force_requires_uuid() {
-        assert!(delete_action("123e4567-e89b-12d3-a456-426614174000", true).is_ok());
+        assert!(delete_action("123e4567-e89b-12d3-a456-426614174000", /*force*/ true).is_ok());
 
-        let err = delete_action("my-thread", true).expect_err("name should require prompt");
+        let err =
+            delete_action("my-thread", /*force*/ true).expect_err("name should require prompt");
         assert_eq!(
             err.to_string(),
             "--force requires a session UUID; names must be confirmed interactively"
diff --git a/codex-rs/cli/src/remote_control_cmd.rs b/codex-rs/cli/src/remote_control_cmd.rs
index 20f4f4500d..bd0f16b82f 100644
--- a/codex-rs/cli/src/remote_control_cmd.rs
+++ b/codex-rs/cli/src/remote_control_cmd.rs
@@ -673,17 +673,22 @@ mod tests {
     #[test]
     fn remote_control_pairing_human_output_labels_the_manual_code() {
         assert_eq!(
-            format_remote_control_pairing_output(&pairing_response(Some("ABCD-EFGH")), false)
-                .expect("manual pairing output"),
+            format_remote_control_pairing_output(
+                &pairing_response(Some("ABCD-EFGH")),
+                /*json*/ false,
+            )
+            .expect("manual pairing output"),
             "Pairing code: ABCD-EFGH"
         );
     }
 
     #[test]
     fn remote_control_pairing_json_output_preserves_pairing_artifacts() {
-        let output =
-            format_remote_control_pairing_output(&pairing_response(Some("ABCD-EFGH")), true)
-                .expect("pairing JSON output");
+        let output = format_remote_control_pairing_output(
+            &pairing_response(Some("ABCD-EFGH")),
+            /*json*/ true,
+        )
+        .expect("pairing JSON output");
         assert_eq!(
             serde_json::from_str::<serde_json::Value>(&output).expect("valid JSON"),
             json!({
@@ -698,9 +703,12 @@ mod tests {
     #[test]
     fn remote_control_pairing_human_output_requires_manual_code() {
         assert_eq!(
-            format_remote_control_pairing_output(&pairing_response(None), false)
-                .expect_err("missing manual pairing code should fail")
-                .to_string(),
+            format_remote_control_pairing_output(
+                &pairing_response(/*manual_pairing_code*/ None),
+                /*json*/ false,
+            )
+            .expect_err("missing manual pairing code should fail")
+            .to_string(),
             "remote-control pairing response did not include a manual pairing code"
         );
     }
diff --git a/codex-rs/windows-sandbox-rs/BUILD.bazel b/codex-rs/windows-sandbox-rs/BUILD.bazel
index 4a4253472d..af54a80c47 100644
--- a/codex-rs/windows-sandbox-rs/BUILD.bazel
+++ b/codex-rs/windows-sandbox-rs/BUILD.bazel
@@ -2,6 +2,7 @@ load("//:defs.bzl", "codex_rust_crate")
 
 codex_rust_crate(
     name = "windows-sandbox-rs",
+    binary_test_target_compatible_with = ["@platforms//os:windows"],
     build_script_data = [
         "codex-windows-sandbox-setup.manifest",
     ],