diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a35c32743..d98726029 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         tox-test: ["default"]
 
     steps:
diff --git a/pyproject.toml b/pyproject.toml
index d6a215b1c..35d133f5b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,6 +19,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Topic :: Communications",
   "Topic :: Utilities",
 ]
@@ -43,6 +44,7 @@ test = [
   "hypothesis",
   "packaging",
   "vdirsyncer",
+  "pkg_resources; python_version >= '3.12'",
 ]
 docs = [
   "sphinx!=1.6.1",
diff --git a/tox.ini b/tox.ini
index 80d30619f..6a7da249b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,6 +34,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [testenv:docs]
 whitelist_externals = make