diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 55daaedb..24c4888c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,6 +24,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
 
     steps:
       - uses: actions/checkout@v2
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cadee65d..28f5cf50 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,7 @@ Changelog
   If you wish to have the old behavior, set ``ordering=[]`` to your ``TaggableManager`` instance.
   We believe that this should not cause a noticable performance change, and the number of queries involved should not change.
 * Add Django 5.0 support (no code changes were needed, but now we test this release).
+* Add Python 3.12 support
 
 5.0.1 (2023-10-26)
 ~~~~~~~~~~~~~~~~~~
diff --git a/tox.ini b/tox.ini
index 9af83cf6..d3152f08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,9 @@ envlist =
     black
     flake8
     isort
-    py{38,39,310,311}-dj{41,42}
-    py{310,311}-dj{50}
-    py{310,311}-djmain
+    py{38,39,310,311,312}-dj{41,42}
+    py{310,311,312}-dj{50}
+    py{310,311,312}-djmain
     docs
 
 [gh-actions]
@@ -15,6 +15,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [testenv]
 deps =