diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ea55f0a1b1..b02171e707 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -92,14 +92,17 @@ jobs:
     needs: [lint-python]
     strategy:
       fail-fast: false
-      max-parallel: 15
+      max-parallel: 11
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-        python: ["3.8", "3.10", "3.12"]
+        python: ["3.9", "3.11", "3.13"]
         node: [18.x, 20.x, 22.x]
-        include:  # `npm test` runs Windows find-visualstudio tests on an Intel Mac!!!
+        include:
           - os: macos-13
-            python: "3.12"
+            python: "3.13"
+            node: 22.x
+          - os: windows-2025
+            python: "3.13"
             node: 22.x
     name: ${{ matrix.os }} - ${{ matrix.python }} - ${{ matrix.node }}
     runs-on: ${{ matrix.os }}
@@ -129,14 +132,14 @@ jobs:
       - name: Run Python Tests
         run: python -m pytest
       - name: Run Tests (macOS or Linux)
-        if: "!startsWith(matrix.os, 'windows')"
+        if: runner.os != 'Windows'
         shell: bash
         run: npm test --python="${pythonLocation}/python"
         env:
-          FULL_TEST: ${{ (matrix.node == '22.x' && matrix.python == '3.12') && '1' || '0' }}
+          FULL_TEST: ${{ (matrix.node == '22.x' && matrix.python == '3.13') && '1' || '0' }}
       - name: Run Tests (Windows)
-        if: startsWith(matrix.os, 'windows')
+        if: runner.os == 'Windows'
         shell: bash # Building wasm on Windows requires using make generator, it only works in bash
         run: npm run test --python="${pythonLocation}\\python.exe"
         env:
-          FULL_TEST: ${{ (matrix.node == '22.x' && matrix.python == '3.12') && '1' || '0' }}
+          FULL_TEST: ${{ (matrix.node == '22.x' && matrix.python == '3.13') && '1' || '0' }}
diff --git a/.github/workflows/visual-studio.yml b/.github/workflows/visual-studio.yml
index 0f51f9c8d0..3412837422 100644
--- a/.github/workflows/visual-studio.yml
+++ b/.github/workflows/visual-studio.yml
@@ -21,6 +21,8 @@ jobs:
             msvs-verison: 2019
           - os: windows-2022
             msvs-version: 2022
+          - os: windows-2025
+            msvs-version: 2022  # Fix this when Visual Studio 2025 is released
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Repository