diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ce0df1c..f5e25e6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,8 +10,19 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
         django-version: ['2.2', '3.1', '3.2', 'main']
+        exclude:
+        # Django prior to 3.2 does not support Python 3.10
+        - django-version: '2.2'
+          python-version: '3.10'
+        - django-version: '3.1'
+          python-version: '3.10'
+        # Django after 3.2 drop support for Python prior to 3.8
+        - django-version: 'main'
+          python-version: '3.6'
+        - django-version: 'main'
+          python-version: '3.7'
 
     steps:
     - uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index 8a1fbf3..72c46c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py{36,37,38,39}-dj{22,31,32}
-    py{38,39}-djmain
+    py{36,37,38,39,310}-dj{22,31,32}
+    py{38,39,310}-djmain
     lint
     sphinx
     readme
@@ -12,6 +12,7 @@ python =
     3.7: py37
     3.8: py38, lint, sphinx, readme
     3.9: py39
+    3.10: py310
 
 [gh-actions:env]
 DJANGO =