diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fa345fd3..697f1fab 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,6 +18,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
           - "pypy3.8"
           - "pypy3.9"
           - "pypy3.10"
@@ -44,7 +45,7 @@ jobs:
           tox
           codecov
       - name: Build checking
-        if: "matrix.python-version == '3.11'"
+        if: "matrix.python-version == '3.12'"
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
diff --git a/pyproject.toml b/pyproject.toml
index 5cc2aff6..cfd2f20b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,7 +40,8 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
-  "Programming Language :: Python :: 3.11"
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12"
 ]
 # This is needed until ci-environment&messages become regular PyPi packages
 dependencies = [
diff --git a/tox.ini b/tox.ini
index 47a2be3f..6a4d4624 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,16 @@
 [tox]
 envlist =
-    py311-pre-commit-lin
-    py311-pytest{625, 74, 73, 72, 71, 70, latest}-mypy-lin
-    py311-pytest{625, 74, 73, 72, 71, 70, latest}-coverage-lin
-    py311-pytestlatest-gherkin{24, latest}-xdist-coverage-{lin, win, mac}
-    py311-pytestlatets-allure-coverage-{lin, win, mac}
+    py312-pre-commit-lin
+    py312-pytest{625, 74, 73, 72, 71, 70, latest}-mypy-lin
+    py312-pytest{625, 74, 73, 72, 71, 70, latest}-coverage-lin
+    py312-pytestlatest-gherkin{24, latest}-xdist-coverage-{lin, win, mac}
+    py312-pytestlatets-allure-coverage-{lin, win, mac}
     py39-pytest{62, 61, 60, 54, 53, 52, 51, 50}-coverage-lin
     py38-pytest{62, 54}-coverage-{win, mac}
     py{py39, py38, 38}-pytest{62, 54}-coverage-lin
-    py{310, 39, 38}-pytestlatest-mypy-lin
-    py{py310, py39, py38, 310, 39, 38}-pytestlatest-coverage-{lin, win, mac}
-    py{py310, py39, py38, 310, 39, 38}-pytestlatest-xdist-coverage-{lin, win, mac}
+    py{311, 310, 39, 38}-pytestlatest-mypy-lin
+    py{py310, py39, py38, 311, 310, 39, 38}-pytestlatest-coverage-{lin, win, mac}
+    py{py310, py39, py38, 311, 310, 39, 38}-pytestlatest-xdist-coverage-{lin, win, mac}
 isolated_build = true
 distshare = {homedir}/.tox/distshare
 
@@ -49,14 +49,14 @@ platform =
     mac: darwin
     win: win32
 
-[testenv:py311-pre-commit]
+[testenv:py312-pre-commit]
 skip_install = true
 deps =
     pre-commit
 commands =
     pre-commit run --all-files
 
-[testenv:py{38,39,310,311}-pytest{latest,625,70,71,72,73,74}-mypy]
+[testenv:py{38,39,310,311,312}-pytest{latest,625,70,71,72,73,74}-mypy]
 deps =
     .[testtypes]
 commands =
@@ -68,6 +68,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
     pypy-3.8: pypy38
     pypy-3.9: pypy39
     pypy-3.10: pypy310