diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 68e2425..3069ccb 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -13,39 +13,51 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, pypy2, pypy3]
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", pypy2, pypy3]
         exclude:
           - os: macos-latest
-            python-version: 3.5
+            python-version: "3.5"
           - os: windows-latest
-            python-version: 3.5
+            python-version: "3.5"
           - os: macos-latest
-            python-version: 3.6
+            python-version: "3.6"
           - os: windows-latest
-            python-version: 3.6
+            python-version: "3.6"
+          - os: macos-latest
+            python-version: pypy3
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - run: pip install --upgrade pip && pip install wheel
     - name: Test
       run: |
         python setup.py test
+    - name: Build
+      run: |
+        python setup.py bdist_wheel
+    - name: Save build artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: artifact-${{ matrix.python-version }}-${{ matrix.os }}
+        path: dist/splitstream-*.whl
+        retention-days: 7
   publish:
     needs: build
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags')
     steps:
     - uses: actions/checkout@v2
     - name: Build dist
       run: |
         python setup.py sdist
     - name: Publish to PyPi
+      if: startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@master
       with:
         password: ${{ secrets.pypi }}
diff --git a/setup.py b/setup.py
index 1b5304a..f78236e 100644
--- a/setup.py
+++ b/setup.py
@@ -35,11 +35,14 @@
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.2",
-        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Intended Audience :: Developers"]