diff --git a/.github/workflows/swift_test_matrix.yml b/.github/workflows/swift_test_matrix.yml
index 19e1ed521d..b8e5b8e80b 100644
--- a/.github/workflows/swift_test_matrix.yml
+++ b/.github/workflows/swift_test_matrix.yml
@@ -91,10 +91,13 @@ jobs:
       - name: Run matrix job
         run: |
           ${{ matrix.linux.command }} ${{ matrix.linux.command_arguments }}
+    env:
+      SWIFT_VERSION: ${{ matrix.linux.swift_version }}
 
   windows:
     name: Windows (${{ matrix.windows.name }})
     needs: generate-matrix
+    if: ${{ needs.generate-matrix.outputs.windows-matrix != '{"windows":[]}' }}
     runs-on: ${{ matrix.windows.runner }}
     strategy:
       fail-fast: false