diff --git a/.github/workflows/node-gyp.yml b/.github/workflows/node-gyp.yml
index 72b0d9c..56cdb40 100644
--- a/.github/workflows/node-gyp.yml
+++ b/.github/workflows/node-gyp.yml
@@ -10,8 +10,15 @@ jobs:
       fail-fast: false
       matrix:
         node-version: ["22"]
-        os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-latest, windows-latest]
         python-version: ["3.9", "3.11", "3.13"]
+        include:
+          - node-version: "22"
+            os: macos-13
+            python-version: "3.13"
+          - node-version: "22"
+            os: windows-2025
+            python-version: "3.13"
     runs-on: ${{ matrix.os }}
     steps:
       - name: Clone gyp-next
@@ -47,7 +54,6 @@ jobs:
           cp -r gyp-next node-gyp/gyp
       - name: Run tests (macOS or Linux)
         if: runner.os != 'Windows'
-        shell: bash
         run: |
           cd node-gyp
           npm test --python="${pythonLocation}/python"
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index b57d97f..213fcbd 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -9,8 +9,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-latest, windows-latest]
         python: ["3.9", "3.11", "3.13"]
+        include:
+          - os: macos-13
+            python-version: "3.13"
+          - os: windows-2025
+            python-version: "3.13"
 
     runs-on: ${{ matrix.os }}
     steps: