diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 43f07857..dd702c8a 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index 9170d1cb..702cca90 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,22 @@
 [tox]
 distribute = False
 envlist =
-    py{37,38,39}-django{22,30,31,32}{-svg,}
-    py310-django{32,40,41}{-svg,}
+    py{36,37,38,39,310}-django32{-svg,}
+    py{38,39,310,311}-django40{-svg,}
+    py{38,39,310,311}-django41{-svg,}
+    py{38,39,310,311,312}-django42{-svg,}
+    py{310,311,312}-django50{-svg,}
 skip_missing_interpreters = True
 
 [gh-actions]
 python =
+    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
+    3.12: py312
 
 [testenv]
 setenv =
@@ -19,14 +25,14 @@ usedevelop = True
 extras =
     svg: svg
 deps =
-    django22: Django<2.3
-    django30: Django<3.1
-    django31: Django<3.2
     django32: Django<3.3
     django40: Django<4.1
     django41: Django<4.2
+    django42: Django<4.3
+    django50: Django<5.1
     testfixtures
 commands =
     python -Wd {envbindir}/django-admin test {posargs}
 ignore_outcome =
     djangomain: true
+