diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 75779548..ab63c42f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index 5383d01e..8ad3cdb0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,11 @@
 skipsdist = False
 usedevelop = true
 envlist =
-    py{37,38,39}-dj{22,32}
-    py{38,39}-dj{40,405}
+    py{37,38,39}-dj22
+    py{38,39,310}-dj40
+    py{38,39,310,311}-dj41
+    py{38,39,310,311}-dj42
+    py{310,311}-dj50
     flake8
 
 [gh-actions]
@@ -11,13 +14,17 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39, flake8
+    3.10: py310
+    3.11: py311
 
 [gh-actions:env]
 DJANGO =
     2.2: dj22
     3.2: dj32
     4.0: dj40
-	4.0.5: dj405
+    4.1: dj41
+    4.2: dj42
+    5.0: dj50
 
 [testenv]
 usedevelop = true
@@ -40,8 +47,10 @@ deps =
     firebase-admin>=6.2
     dj22: Django>=2.2,<3.0
     dj32: Django>=3.2,<3.3
-    dj40: Django>=4.0,<4.0.5
-	dj405: Django>=4.0.5,<4.1
+    dj40: Django>=4.0,<4.1
+    dj41: Django>=4.1.3,<4.2
+    dj42: Django>=4.2.8,<4.3
+    dj50: Django>=5.0,<5.1
 
 [testenv:flake8]
 commands = flake8 --exit-zero