diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a2c207a..c7d300e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ "ubuntu-latest" ]
-        python-version: [ "3.7", "3.11" ]
+        python-version: [ "3.7", "3.11", "3.12-dev" ]
         grafana-version: [ "6.7.6", "7.5.17", "8.5.27", "9.5.8", "10.1.1" ]
 
     env:
diff --git a/CHANGES.rst b/CHANGES.rst
index 65d0f46..7c0d0c4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,7 @@ in progress
 - CI: Update to Grafana 8.5.27, 9.5.8, and 10.1.1
 - Grafana 9.3: Work around delete folder operation returning empty body
 - Grafana 9.5: Use standard UUIDs instead of short UIDs
+- CI: Add support for Python 3.12
 
 2023-07-30 0.15.2
 =================
diff --git a/setup.py b/setup.py
index ba9eb0e..616a0f4 100644
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,7 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Communications",
         "Topic :: Database",
         "Topic :: Internet",