diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 34b512c..cc8d63a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,7 +27,8 @@ jobs:
           - '3.7'
           - '3.8'
           - '3.9'
-          - 'pypy3'
+          - '3.10'
+          - 'pypy-3.7'
         toxenv: [py]
         include:
           - python-version: '3.6'
@@ -38,7 +39,7 @@ jobs:
             os: ubuntu-latest
         exclude:
           # venv seems to be broken on pypy3 under Windows.
-          - python-version: 'pypy3'
+          - python-version: 'pypy-3.7'
             toxenv: py
             os: windows-latest
     steps:
diff --git a/setup.cfg b/setup.cfg
index 1a3ab49..5cce6ba 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,6 +30,7 @@ classifiers =
     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
     License :: OSI Approved :: MIT License
diff --git a/tox.ini b/tox.ini
index 7004da5..05381af 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = typing,py36,py37,py38,py39,pypy3
+envlist = typing,py36,py37,py38,py39,py310,pypy3
 skip_missing_interpreters = True
 isolated_build = True
 minversion = 3.3.0