diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 815d190..aee7b35 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -8,7 +8,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ 3.6, 3.7, 3.8, 3.9, '3.10' ]
+        python-version: [ 3.7, 3.8, 3.9, '3.10', '3.11', '3.12' ]
+      fail-fast: false
 
     steps:
       - uses: actions/checkout@v1
diff --git a/tox.ini b/tox.ini
index d4a1840..ae65044 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,10 +2,12 @@
 envlist =
     begin
     py36-lint
-    py{36,37,38,39}-django{2}
-    py{36,37,38,39,310}-django{21,22,3,31,32}
+    py{36,37}-django{2,21}
+    py{36,37,38,39}-django{22,3,31}
+    py{36,37,38,39,310}-django{32}
     py{38,39,310}-django{40}
-    py{38,39,310}-django{41}
+    py{38,39,310,311}-django{41}
+    py{310,311,312}-django{42,50}
     coverage-report
 
 [gh-actions]
@@ -15,6 +17,7 @@ python =
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
 
 [testenv]
 passenv = GITHUB_*
@@ -27,7 +30,9 @@ deps=
     django31: Django>=3.1,<3.2
     django32: Django>=3.2,<4.0
     django40: Django>=4.0,<4.1
-    django41: Django>=4.1,<5.0
+    django41: Django>=4.1,<4.2
+    django42: Django>=4.2,<5.0
+    django50: Django>=5.0,<5.1
     coverage[toml]
     pillow
     ipdb