diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index cf5f0b4b91..4fb5eef968 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+        python-version: [2.7, 3.6, 3.7, 3.8, 3.9, 3.10-dev]
         os: [ubuntu-18.04, macOS-latest, windows-latest]
         include:
           # pypy3 on Mac OS currently fails trying to compile
diff --git a/requirements-dev.txt b/requirements-dev.txt
index effb0c81f5..bc4c3e4b14 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,4 @@
-pytest>=2.8.0,<=3.10.1
+pytest>=2.8.0,<=6.2.5
 pytest-cov
 pytest-httpbin==1.0.0
 pytest-mock==2.0.0
diff --git a/setup.py b/setup.py
index ce5e5c8009..008565a6d3 100755
--- a/setup.py
+++ b/setup.py
@@ -95,6 +95,7 @@ def run_tests(self):
         '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'
     ],