diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8f9ca83..5846174 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9, "3.10"]
+        python: [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 e0b6023..9cd7b18 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,11 @@
     install_requires=[
         'marabunta>=0.12.0',
         'mergedeep>=1.3.4',
-        'PyYAML>=6.0',
+        'PyYAML>=6.0.1',
+        # marabunta uses distutils, but it was removed in 3.12, so
+        # we must install setuptools manually, before marabunta fixes
+        # this themselves.
+        'setuptools>=70.3.0',
     ],
     tests_require=test_deps,
     extras_require=extras,
@@ -35,8 +39,8 @@
     classifiers=[
         'Intended Audience :: Developers',
         'Natural Language :: English',
-        'License :: OSI Approved :: ' +
-        'GNU Affero General Public License v3 or later (AGPLv3+)',
+        'License :: OSI Approved :: '
+        + 'GNU Affero General Public License v3 or later (AGPLv3+)',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
diff --git a/tox.ini b/tox.ini
index ff30791..08c829f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,py39,py310,lint
+envlist = py37,py38,py39,py310,311,312,lint
 
 [testenv]
 extras = test