diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec337b18..9e6ae5af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,10 +26,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.10"]
         experimental: [false]
         include:
-          - python-version: "3.10"
+          - python-version: "3.11"
             experimental: true
 
     services:
@@ -67,6 +67,6 @@ jobs:
         run: pip install tox tox-gh-actions
 
       - name: "Run tests"
-        run: tox ${{ matrix.experimental && '-e py310-djmain' || '' }}
+        run: tox ${{ matrix.experimental && '-e py311-djmain' || '' }}
         env:
           MYSQL_HOST: 127.0.0.1
diff --git a/setup.py b/setup.py
index 165029f7..fda5a9c5 100644
--- a/setup.py
+++ b/setup.py
@@ -38,11 +38,13 @@
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Framework :: Django',
         'Framework :: Django :: 3.2',
         'Framework :: Django :: 4.0',
         'Framework :: Django :: 4.1',
         'Framework :: Django :: 4.2',
+        'Framework :: Django :: 5.0',
 
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
diff --git a/tox.ini b/tox.ini
index f596dcac..19d3d3e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,8 @@ envlist =
     py37-dj32,
     py{38,39}-dj{32,40},
     py310-dj{32,40,41},
-    py311-dj{41,42},
+    py311-dj{41,42,50},
+    py312-dj{42,50},
     pypy310-dj40
 
 [gh-actions]
@@ -14,6 +15,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
     pypy-3.10: pypy310
 
 
@@ -30,7 +32,8 @@ deps =
     dj32: Django>=3.2,<3.3
     dj40: Django>=4.0,<4.1
     dj41: Django>=4.1,<4.2
-    dj42: Django==4.2b1
+    dj42: Django>=4.2.8,<5.0
+    dj50: Django>=5.0,<5.1
     djmain: git+https://github.com/django/django
     mysqlclient
     py{37,38,39,310,311}: psycopg2-binary