diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4b26da0a..d84e4dc4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,14 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ['3.6', '3.7', '3.8', '3.9', 'pypy3']
-        exclude:
-          # pypy3 currently fails to run on Windows
-          - os: windows-latest
-            python: pypy3
-          # the loop fails to close in the Mac version of 3.9
-          - os: macos-latest
-            python: '3.9'
+        python: ['3.7', '3.8', '3.9', '3.10', 'pypy-3.8']
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/tox.ini b/tox.ini
index b9b3541f..d02d9cf4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
-envlist=flake8,py36,py37,py38,py39,pypy3,docs
+envlist=flake8,py37,py38,py39,py310,pypy3,docs
 skip_missing_interpreters=True
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
     pypy3: pypy3
 
 [testenv]