diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bc70dc3..bd31810 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,12 +4,24 @@ on: [push, pull_request]
 
 jobs:
   tests:
-    name: Python ${{ matrix.python-version }}
-    runs-on: ubuntu-latest
+    name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
 
     strategy:
-      matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.9"]
+      - matrix.python-version: "3.7"
+        matrix.os: ubuntu-latest
+      - matrix.python-version: "3.8"
+        matrix.os: ubuntu-latest
+      - matrix.python-version: "3.9"
+        matrix.os: ubuntu-latest
+      - matrix.python-version: "3.10"
+        matrix.os: ubuntu-latest
+      - matrix.python-version: "3.11"
+        matrix.os: ubuntu-latest
+      - matrix.python-version: "3.12"
+        matrix.os: ubuntu-latest
+      - matrix.python-version: "pypy39"
+        matrix.os: windows-latest
 
     steps:
       - uses: actions/checkout@v3
@@ -19,6 +31,9 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Upgrade pip to latest
+        run: pip install --upgrade pip
+
       - name: Install dependencies
         run: pip install pytest pytest-cov python-coveralls coverage flake8 pydocstyle setuptools