diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 72ff56a..4c05fa3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         django-version: ["3.2", "4.0", "4.1", "4.2", "5.0"]
         exclude:
           # Python 3.11 is not supported until Django 4.1
@@ -20,6 +20,14 @@ jobs:
           - python-version: "3.11"
             django-version: "4.0"
 
+          # Python 3.12 is not supported until Django 4.2
+          - python-version: "3.12"
+            django-version: "3.2"
+          - python-version: "3.12"
+            django-version: "4.0"
+          - python-version: "3.12"
+            django-version: "4.1"
+
           # Python <3.10 is not supported by Django 5.0+
           - python-version: "3.8"
             django-version: "5.0"
diff --git a/tox.ini b/tox.ini
index caad72c..923a39b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,8 @@
 isolated_build = true
 envlist =
     py{38,39,310,311}-django{32,40,41,42}
-    py{310,311}-django50
+    py312-django42
+    py{310,311,312}-django50
 
 [gh-actions]
 python =
@@ -10,6 +11,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [gh-actions:env]
 django-version =