diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0d312ecf..50b2db55 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/setup.cfg b/setup.cfg
index f471a1d0..18c62bbd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,7 +22,8 @@ classifiers =
 	Programming Language :: Python :: 3.7
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
-	Topic :: Internet :: WWW/HTTP
+    Programming Language :: Python :: 3.10
+    Topic :: Internet :: WWW/HTTP
 	Topic :: System :: Networking
 
 [options]
diff --git a/tox.ini b/tox.ini
index a990906f..c7cf7aee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,9 @@
 skipsdist = False
 usedevelop = true
 envlist =
-    py{36,37,38,39}-dj{22,32}
-    py{38,39}-dj{40,405}
+    py{36,37,38,39}-dj22
+    py{36,37,38,39,310}-dj32
+    py{38,39,310}-dj{40,405,main}
     flake8
 
 [gh-actions]
@@ -12,6 +13,7 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39, flake8
+    3.10: py310
 
 [gh-actions:env]
 DJANGO =