diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6b022ba28..6b94d0856 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -113,20 +113,42 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-latest', 'macos-13', 'macos-latest']
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13t"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.13t"]
         architecture: ['x64', 'x86', 'arm64']
         dependencies: ['full', 'pre']
         include:
           # Basic dependencies only
           - os: ubuntu-latest
-            python-version: 3.9
+            python-version: "3.9"
             dependencies: 'none'
           # Absolute minimum dependencies
           - os: ubuntu-latest
-            python-version: 3.9
+            python-version: "3.9"
             dependencies: 'min'
         exclude:
-          # x86 for Windows + Python<3.12
+          # Use ubuntu-latest to cover the whole range of Python. For Windows
+          # and OSX, checking oldest and newest should be sufficient.
+          - os: windows-latest
+            python-version: "3.10"
+          - os: windows-latest
+            python-version: "3.11"
+          - os: windows-latest
+            python-version: "3.12"
+          - os: macos-13
+            python-version: "3.10"
+          - os: macos-13
+            python-version: "3.11"
+          - os: macos-13
+            python-version: "3.12"
+          - os: macos-latest
+            python-version: "3.10"
+          - os: macos-latest
+            python-version: "3.11"
+          - os: macos-latest
+            python-version: "3.12"
+
+          # Unavailable architectures
+          # x86 is only available for Windows + Python<3.12
           - os: ubuntu-latest
             architecture: x86
           - os: macos-13
@@ -135,6 +157,8 @@ jobs:
             architecture: x86
           - python-version: '3.12'
             architecture: x86
+          - python-version: '3.13'
+            architecture: x86
           - python-version: '3.13t'
             architecture: x86
           # arm64 is available for macos-14+
@@ -147,6 +171,8 @@ jobs:
           # x64 is not available for macos-14+
           - os: macos-latest
             architecture: x64
+
+          # Reduced support
           # Drop pre tests for macos-13
           - os: macos-13
             dependencies: pre