diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c8fe651f..3d55a041 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -13,8 +13,11 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: [ 3.6, 3.7, 3.8 ]
+                python-version: [ 3.6, 3.7, 3.8, 3.9, 3.10 ]
                 django: [ 22, 31, 32 ]
+                exclude:
+                    - python-version: 3.10
+                      django: 22
         services:
             postgres:
                 image: postgres
diff --git a/setup.py b/setup.py
index 1d5de675..0d63d549 100644
--- a/setup.py
+++ b/setup.py
@@ -37,12 +37,15 @@ def _pyimp():
     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
     Framework :: Django
     Framework :: Django :: 2.2
     Framework :: Django :: 3.0
     Framework :: Django :: 3.1
+    Framework :: Django :: 3.2
     Operating System :: OS Independent
     Topic :: Communications
     Topic :: System :: Distributed Computing
diff --git a/tox.ini b/tox.ini
index a5c2fcf4..f8bccdda 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,10 @@
 [tox]
 envlist =
+    py310-django{31,32}
+    py39-django{22,31,32}
     py38-django{22,31,32}
-    py36-django{22,31,32}
     py37-django{22,31,32}
+    py36-django{22,31,32}
     pypy3-django{22,31,32}
 
     flake8