diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d191b4315..9507d7501 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, "3.10", 3.11]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, "3.10", 3.11, 3.12]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/setup.py b/setup.py
index eeb9b34e3..380dfa960 100644
--- a/setup.py
+++ b/setup.py
@@ -68,6 +68,7 @@
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 
 version_txt = os.path.join(here, 'supervisor/version.txt')
diff --git a/tox.ini b/tox.ini
index b495fb11d..9b3cb232f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    cover,cover3,docs,py27,py34,py35,py36,py37,py38,py39,py310
+    cover,cover3,docs,py27,py34,py35,py36,py37,py38,py39,py310,py311,py312
 
 [testenv]
 deps =