diff --git a/.github/workflows/swift_matrix.yml b/.github/workflows/swift_matrix.yml
index 47ad6e94ff..72f918ff65 100644
--- a/.github/workflows/swift_matrix.yml
+++ b/.github/workflows/swift_matrix.yml
@@ -151,7 +151,6 @@ jobs:
   windows:
     name: Windows (${{ matrix.swift.swift_version }})
     runs-on: windows-2022
-    if: ${{ inputs.matrix_windows_6_0_enabled }}
     strategy:
       fail-fast: false
       matrix:
@@ -160,6 +159,7 @@ jobs:
           - image: swift:6.0-windowsservercore-ltsc2022
             swift_version: "6.0"
             enabled: ${{ inputs.matrix_windows_6_0_enabled }}
+    if: ${{ inputs.matrix_windows_6_0_enabled }}
     steps:
       - name: Pull Docker image
         if: ${{ matrix.swift.enabled }}
@@ -180,7 +180,6 @@ jobs:
   windows-nightly:
     name: Windows (${{ matrix.swift.swift_version }})
     runs-on: windows-2019
-    if: ${{ inputs.matrix_windows_nightly_6_0_enabled }} && ${{ inputs.matrix_windows_nightly_main_enabled }}
     strategy:
       fail-fast: false
       matrix:
@@ -192,6 +191,7 @@ jobs:
           - image: swiftlang/swift:nightly-main-windowsservercore-1809
             swift_version: "nightly-main"
             enabled: ${{ inputs.matrix_windows_nightly_main_enabled }}
+    if: ${{ inputs.matrix_windows_nightly_6_0_enabled }} || ${{ inputs.matrix_windows_nightly_main_enabled }}
     steps:
       - name: Pull Docker image
         if: ${{ matrix.swift.enabled }}
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 091a2b7655..8a70518bb6 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -87,6 +87,7 @@ jobs:
       matrix_linux_nightly_6_0_command_override: "swift test ${{ inputs.linux_nightly_6_0_arguments_override }}"
       matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}
       matrix_linux_nightly_main_command_override: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"
+      matrix_windows_command: "swift test"
       matrix_windows_6_0_enabled: ${{ inputs.windows_6_0_enabled }}
       matrix_windows_6_0_command_override: "swift test ${{ inputs.windows_6_0_arguments_override }}"
       matrix_windows_nightly_6_0_enabled: ${{ inputs.windows_nightly_6_0_enabled }}