diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index befb2c02..6e55ba43 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,10 +23,10 @@ jobs:
     steps:
       - name: Clone repo
         uses: actions/checkout@v4
-      - name: Set up Python 3.11
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install native dependencies
         run: sudo apt-get update && sudo apt-get -y install libdbus-1-dev libgirepository1.0-dev
       - name: Cache Python packages
@@ -47,10 +47,10 @@ jobs:
     steps:
       - name: Clone repo
         uses: actions/checkout@v4
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install native dependencies
         run: sudo apt-get update && sudo apt-get -y install libdbus-1-dev libgirepository1.0-dev plantuml
       - name: Cache Python packages
@@ -71,7 +71,7 @@ jobs:
     steps:
       - name: Clone repo
         uses: actions/checkout@v4
-      - name: Set up Python 3.9
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: 3.9
@@ -93,7 +93,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - name: Clone repo
diff --git a/tox.ini b/tox.ini
index c7f72eaf..5de70ec8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = coverage-clean,test-py39-psutil58-dateutil28-tzlocal2, test-py{310,311}-psutillatest-dateutillatest-tzlocal{4,latest}, integration-py{39,310,311}, mindeps, check, docs, coverage
+envlist = coverage-clean,test-py39-psutil58-dateutil28-tzlocal2, test-py{310,311,312}-psutillatest-dateutillatest-tzlocal{4,latest}, integration-py{39,310,311,312}, mindeps, check, docs, coverage
 
 [testenv]
 extras = test
@@ -28,7 +28,7 @@ commands = coverage erase
 depends =
 
 [testenv:coverage]
-depends = test-py39-psutil{58,latest}-dateutil{28,latest}, test-py{310,311}-psutillatest-dateutillatest, integration-py{39,310,311}
+depends = test-py39-psutil{58,latest}-dateutil{28,latest}, test-py{310,311,312}-psutillatest-dateutillatest, integration-py{39,310,311,312}
 deps =
     coverage
 skip_install = true
@@ -60,7 +60,7 @@ commands =
     {envbindir}/mypy src tests
 
 [testenv:docs]
-basepython = python3.11
+basepython = python3.12
 depends =
 deps = -rrequirements-doc.txt
 commands = {envbindir}/sphinx-build -W -b html -d {envtmpdir}/doctrees doc/source {envtmpdir}/html
@@ -70,3 +70,4 @@ python =
     3.9: py39, coverage
     3.10: py310, coverage
     3.11: py311, coverage
+    3.12: py312, coverage