diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 404a9548..217bd10a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,27 +45,27 @@ jobs:
     strategy:
       matrix:
         include:
-          # - { wheel: cp38-macosx_arm64,      os: macos-latest   }
-          # - { wheel: cp38-macosx_x86_64,     os: macos-latest   }
-          # - { wheel: cp38-manylinux_x86_64,  os: ubuntu-latest  }
-          # - { wheel: cp38-win_amd64,         os: windows-latest }
-          # - { wheel: cp39-macosx_arm64,      os: macos-latest   }
-          # - { wheel: cp39-macosx_x86_64,     os: macos-latest   }
-          # - { wheel: cp39-manylinux_x86_64,  os: ubuntu-latest  }
-          # - { wheel: cp39-win_amd64,         os: windows-latest }
-          # - { wheel: cp310-macosx_arm64,     os: macos-latest   }
-          # - { wheel: cp310-macosx_x86_64,    os: macos-latest   }
-          # - { wheel: cp310-manylinux_x86_64, os: ubuntu-latest  }
-          # - { wheel: cp310-win_amd64,        os: windows-latest }
-          # - { wheel: cp311-macosx_arm64,     os: macos-latest   }
-          # - { wheel: cp311-macosx_x86_64,    os: macos-latest   }
-          # - { wheel: cp311-manylinux_x86_64, os: ubuntu-latest  }
-          # - { wheel: cp311-win_amd64,        os: windows-latest }
+          - { wheel: cp38-macosx_arm64,      os: macos-latest   }
+          - { wheel: cp38-macosx_x86_64,     os: macos-latest   }
+          - { wheel: cp38-manylinux_x86_64,  os: ubuntu-latest  }
+          - { wheel: cp38-win_amd64,         os: windows-latest }
+          - { wheel: cp39-macosx_arm64,      os: macos-latest   }
+          - { wheel: cp39-macosx_x86_64,     os: macos-latest   }
+          - { wheel: cp39-manylinux_x86_64,  os: ubuntu-latest  }
+          - { wheel: cp39-win_amd64,         os: windows-latest }
+          - { wheel: cp310-macosx_arm64,     os: macos-latest   }
+          - { wheel: cp310-macosx_x86_64,    os: macos-latest   }
+          - { wheel: cp310-manylinux_x86_64, os: ubuntu-latest  }
+          - { wheel: cp310-win_amd64,        os: windows-latest }
+          - { wheel: cp311-macosx_arm64,     os: macos-latest   }
+          - { wheel: cp311-macosx_x86_64,    os: macos-latest   }
+          - { wheel: cp311-manylinux_x86_64, os: ubuntu-latest  }
+          - { wheel: cp311-win_amd64,        os: windows-latest }
           - { wheel: cp312-macosx_arm64,     os: macos-latest   }
-          # - { wheel: cp312-macosx_x86_64,    os: macos-latest   }
-          # - { wheel: cp312-manylinux_x86_64, os: ubuntu-latest  }
-          # - { wheel: cp312-win_amd64,        os: windows-latest }
-          # - { wheel: pp39-manylinux_x86_64,  os: ubuntu-latest  }
+          - { wheel: cp312-macosx_x86_64,    os: macos-latest   }
+          - { wheel: cp312-manylinux_x86_64, os: ubuntu-latest  }
+          - { wheel: cp312-win_amd64,        os: windows-latest }
+          - { wheel: pp39-manylinux_x86_64,  os: ubuntu-latest  }
 
           # Currently broken with PyPy 7.3? See https://foss.heptapod.net/pypy/pypy/-/issues/4013.
           # - { wheel: pp39-macosx_x86_64,     os: macos-latest   }
@@ -94,11 +94,19 @@ jobs:
           name: wheels
           path: ./wheelhouse/*.whl
 
+  # Make sure the macOS wheels cross-compiled on x86-64 for ARM64 are functional
   test_macos_arm_wheels:
     needs: build_wheels
-    name: Test macOS ARM64 wheels
+    name: Test macOS ARM64 wheel for Python ${{ matrix.python }}
     runs-on: [macOS, ARM64]
-
+    strategy:
+      matrix:
+        include:
+          - { wheel: cp38,  python: '3.8' }
+          - { wheel: cp39,  python: '3.9' }
+          - { wheel: cp310, python: '3.10' }
+          - { wheel: cp311, python: '3.11' }
+          - { wheel: cp312, python: '3.12' }
     steps:
       - uses: actions/download-artifact@v3
         with:
@@ -110,9 +118,9 @@ jobs:
           path: dist
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.12'
+          python-version: ${{ matrix.python }}
       - run: |
-          pip install --force-reinstall ./dist/*cp312*macos*arm64.whl
+          pip install --force-reinstall ./dist/*${{ matrix.wheel }}*macos*arm64.whl
           tar xvf ./dist/pypcode-*.tar.gz
           cd pypcode-*/tests
           python -m unittest discover -v -s .