diff --git a/.github/workflows/pypi_upload.yml b/.github/workflows/pypi_upload.yml
index 5cfb0cb514f..11cb5d99fb6 100644
--- a/.github/workflows/pypi_upload.yml
+++ b/.github/workflows/pypi_upload.yml
@@ -71,11 +71,10 @@ jobs:
         if: github.event_name == 'pull_request'
         run: |
           {
-            cibuildwheel --print-build-identifiers --platform linux \
-            | pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})'
+            CIBW_BUILD="cp39-*" cibuildwheel --print-build-identifiers --platform linux | pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})'
+            CIBW_BUILD="cp314-*" cibuildwheel --print-build-identifiers --platform windows | pyp 'json.dumps({"only": x, "os": "windows-latest"})'
           } | pyp 'json.dumps(list(map(json.loads, lines)))' > /tmp/matrix
         env:
-          CIBW_BUILD: "cp39-* cp313-*"
           CIBW_ARCHS_LINUX: x86_64
       - id: set-matrix
         run: echo "include=$(cat /tmp/matrix)" | tee -a $GITHUB_OUTPUT
@@ -96,7 +95,7 @@ jobs:
         with:
           only: ${{ matrix.only }}
         env:
-          CIBW_TEST_REQUIRES_WINDOWS: "pytest>=6.1.1,^<9.0"
+          CIBW_TEST_REQUIRES_WINDOWS: "pytest^<9.0"
 
       - name: Upload wheels as workflow artifacts
         uses: actions/upload-artifact@v5
diff --git a/pyproject.toml b/pyproject.toml
index e9adc05fba7..6b5df13260f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -151,7 +151,6 @@ options = { debug_level = "0" }
 
 [tool.cibuildwheel]
 build-verbosity = 1
-build-frontend = "build[uv]"
 
 # So these are the environments we target:
 # - Python: CPython 3.9+ only