diff --git a/crates/openshell-core/src/driver_utils.rs b/crates/openshell-core/src/driver_utils.rs
index f4da644d9b..a0c46729c4 100644
--- a/crates/openshell-core/src/driver_utils.rs
+++ b/crates/openshell-core/src/driver_utils.rs
@@ -1248,6 +1248,7 @@ mod tests {
         assert!(validate_guest_spiffe_tcp_endpoint("unix:/run/spire/agent.sock", true).is_err());
     }
 
+    #[cfg(unix)]
     #[test]
     fn credential_file_rejects_fifo_without_hanging() {
         // A FIFO with no writer would block a blocking open() forever. The
diff --git a/crates/openshell-ocsf/tests/event_identity.rs b/crates/openshell-ocsf/tests/event_identity.rs
index 9fa51cc8bd..34a3868ca2 100644
--- a/crates/openshell-ocsf/tests/event_identity.rs
+++ b/crates/openshell-ocsf/tests/event_identity.rs
@@ -68,7 +68,12 @@ fn device_identifies_the_sandbox_environment() {
 
     assert_eq!(json["device"]["type_id"], 99);
     assert_eq!(json["device"]["type"], "Sandbox");
-    assert_eq!(json["device"]["os"]["name"], "Linux");
+    let expected_os = if cfg!(target_os = "windows") {
+        "Windows"
+    } else {
+        "Linux"
+    };
+    assert_eq!(json["device"]["os"]["name"], expected_os);
 }
 
 #[test]
diff --git a/tasks/rust.toml b/tasks/rust.toml
index e8c45fd54c..548e302f12 100644
--- a/tasks/rust.toml
+++ b/tasks/rust.toml
@@ -13,6 +13,7 @@ hide = true
 ["rust:lockfiles:check"]
 description = "Verify all tracked Cargo lockfiles are current"
 run = "tasks/scripts/check-cargo-lockfiles.sh"
+run_windows = "echo Skipping rust:lockfiles:check: Cargo lockfile validation uses a Unix shell helper."
 hide = true
 
 ["rust:lint"]
diff --git a/tasks/typescript.toml b/tasks/typescript.toml
index 823a881359..06f6e8c4f1 100644
--- a/tasks/typescript.toml
+++ b/tasks/typescript.toml
@@ -25,6 +25,7 @@ run = "npm run gen"
 description = "Lint proto/ with buf (repo-level buf.yaml)"
 depends = ["sdk:ts:install"]
 run = "./sdk/typescript/node_modules/.bin/buf lint"
+run_windows = "sdk\\typescript\\node_modules\\.bin\\buf.cmd lint"
 
 ["sdk:ts:typecheck"]
 description = "Type-check the TypeScript SDK"