diff --git a/setup.cfg b/setup.cfg
index bdc21a987..004027352 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,8 @@ classifier =
     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
 requires-dist = setuptools
 keywords =
     saml
diff --git a/tox.ini b/tox.ini
index 32a5714a1..dbaca41ea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist =
   py37
   py38
   py39
+  py310
   pypy3
 
 [testenv]