diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 66221d2..f0aa87c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -107,15 +107,34 @@ jobs:
   windows-test:
     name: Windows Test
     runs-on: windows-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - branch: swift-5.10-release
+            tag: 5.10-RELEASE
+            skip-testing: true
+
+          - branch: swift-6.0-branch
+            tag: 6.0-DEVELOPMENT-SNAPSHOT-2024-08-07-a
+            perform-testing: true
 
-    # TODO: figure out a good matrix pattern for this build, too
     steps:
       - name: Install Swift
         uses: compnerd/gha-setup-swift@main
         with:
-          branch: swift-5.8-release
-          tag: 5.8-RELEASE
+          branch: ${{ matrix.branch}}
+          tag: ${{ matrix.tag }}
+
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Build
+        if: ${{ matrix.skip-testing }}
+        run: |
+          swift build
       - name: Build and test
-        run: swift test
+        if: ${{ matrix.perform-testing }}
+        run: |
+          swift build --build-tests
+          swift test