diff --git a/Tests/CommandsTests/RunCommandTests.swift b/Tests/CommandsTests/RunCommandTests.swift
index 180be748878..b04fe3530a9 100644
--- a/Tests/CommandsTests/RunCommandTests.swift
+++ b/Tests/CommandsTests/RunCommandTests.swift
@@ -399,7 +399,9 @@ struct RunCommandTests {
     }
 
     @Test(
-        .bug("https://github.com/swiftlang/swift-package-manager/issues/8844"),
+        .issue("https://github.com/swiftlang/swift-package-manager/issues/8844", relationship: .verifies),
+        .issue("https://github.com/swiftlang/swift-package-manager/issues/8911", relationship: .defect),
+        .issue("https://github.com/swiftlang/swift-package-manager/issues/8912", relationship: .defect),
         arguments: SupportedBuildSystemOnPlatform, BuildConfiguration.allCases
     )
     func swiftRunQuietLogLevel(
@@ -423,9 +425,12 @@ struct RunCommandTests {
                 #expect(stdout == "done\n")
            }
         } when: {
-            ProcessInfo.hostOperatingSystem == .linux &&
-            buildSystem == .swiftbuild &&
-            CiEnvironment.runningInSelfHostedPipeline
+            (
+                ProcessInfo.hostOperatingSystem == .linux &&
+                buildSystem == .swiftbuild &&
+                CiEnvironment.runningInSelfHostedPipeline
+            )
+            || (CiEnvironment.runningInSmokeTestPipeline && ProcessInfo.hostOperatingSystem == .windows)
         }
     }
 
diff --git a/Tests/CommandsTests/TestCommandTests.swift b/Tests/CommandsTests/TestCommandTests.swift
index 27d6afb28af..4c22aeb2855 100644
--- a/Tests/CommandsTests/TestCommandTests.swift
+++ b/Tests/CommandsTests/TestCommandTests.swift
@@ -239,7 +239,8 @@ struct TestCommandTests {
             }
         } when: {
             (buildSystem == .swiftbuild && .linux == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)
-            || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)
+            // || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)
+            || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem )
         }
     }
 
diff --git a/Tests/PackageLoadingTests/PD_6_2_LoadingTests.swift b/Tests/PackageLoadingTests/PD_6_2_LoadingTests.swift
index 00fedd695f5..19ddde7e991 100644
--- a/Tests/PackageLoadingTests/PD_6_2_LoadingTests.swift
+++ b/Tests/PackageLoadingTests/PD_6_2_LoadingTests.swift
@@ -86,7 +86,7 @@ struct PackageDescription6_2LoadingTests {
                 results.checkIsEmpty()
             }
         } when: {
-            isWindows
+            isWindows && !CiEnvironment.runningInSmokeTestPipeline
         }
     }
 }