diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index 4375f53..4423241 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -32,7 +32,7 @@ jobs:
     name: Build CPython-${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3
+      - uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.13.3
         env:
           CIBW_ARCHS_MACOS: x86_64 universal2
           CIBW_TEST_SKIP: '*universal2:arm64'
@@ -42,49 +42,6 @@ jobs:
           name: ${{ matrix.os }}-wheel
           path: ./wheelhouse/*.whl
           if-no-files-found: error
-  test_non_linux_wheels:
-    needs: build_wheels
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest, windows-latest]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-    name: Test CPython ${{ matrix.python-version }}-${{ matrix.os }}
-    steps:
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          allow-prereleases: true
-      - name: Download a previously created wheel
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ matrix.os }}-wheel
-      - name: Test wheel
-        shell: bash
-        run: |
-          python -m pip install -U pip
-          python -m pip install --no-index --find-links=./ python_bsonjs
-          python -m pip list | grep python-bsonjs
-          python -c "from bsonjs import dumps"
-  # Linux
-  test_manylinux_wheels:
-    runs-on: ${{ matrix.os }}
-    needs: build_wheels
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        container: ['manylinux2014_i686', 'manylinux2014_x86_64']
-        python-version: ['cp39-cp39', 'cp310-cp310', 'cp311-cp311', 'cp312-cp312', 'cp313-cp313']
-    name: Test CPython ${{ matrix.python-version }}-${{ matrix.container }}
-    steps:
-      - name: Download a previously created wheel
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ matrix.os }}-wheel
-      - name: Test wheel
-        run: |
-          docker run --rm --volume `pwd`:/python quay.io/pypa/${{ matrix.container }} /bin/bash -c "/opt/python/${{ matrix.python-version }}/bin/python -m pip install -U pip && /opt/python/${{ matrix.python-version }}/bin/python -m pip install --find-links=/python/ --no-index python_bsonjs &&  /opt/python/${{ matrix.python-version }}/bin/python -m pip list | grep python-bsonjs && /opt/python/${{ matrix.python-version }}/bin/python -c 'from bsonjs import dumps'"
   make_sdist:
     name: Make SDist
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fa1dc49..77a27c9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,8 +16,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-2019]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        os: [macos-latest, ubuntu-latest, windows-latest]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/pyproject.toml b/pyproject.toml
index a251220..4e158a0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,4 +41,8 @@ classifiers = [
 Homepage = "https://github.com/mongodb-labs/python-bsonjs"
 
 [project.optional-dependencies]
-test = ["pymongo>=4", "pytest"]
\ No newline at end of file
+test = ["pymongo>=4", "pytest"]
+
+[tool.cibuildwheel]
+test-command = "pytest {package}/test"
+test-extras = ["test"]
\ No newline at end of file