diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4eebaa385..e9544911a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', pypy-3.7, pypy-3.8, pypy-3.9]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', pypy-3.7, pypy-3.8, pypy-3.9]
         exclude:
           - os: windows-latest
             python-version: pypy-3.7
diff --git a/setup.py b/setup.py
index 144e77c5e..5c21fb933 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",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Office/Business :: Groupware"])