diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9e668b9..1dece09 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -21,6 +21,8 @@ jobs:
                   toxenv: py310
                 - python: "3.11"
                   toxenv: py311
+                - python: "3.12"
+                  toxenv: py312
                 - python: pypy-3.8
                   toxenv: pypy3
                 - python: 3.7
@@ -31,6 +33,10 @@ jobs:
                   toxenv: py39-pytest
                 - python: "3.10"
                   toxenv: py310-pytest
+                - python: "3.11"
+                  toxenv: py311-pytest
+                - python: "3.12"
+                  toxenv: py312-pytest
                 - python: 3.9
                   toxenv: py39-failskip
                 - python: 3.9
diff --git a/tox.ini b/tox.ini
index 698d131..6c22b61 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.1.1
 skipsdist = True
-envlist = pep8,py37,py38,py39,py310,pypy3,pep8,limit,failskip,docs,py39-prefix,py39-limit,py39-verbosity,py39-failskip,py36-pytest,py37-pytest,py38-pytest,py39-pytest,py310-pytest
+envlist = pep8,py37,py38,py39,py310,py311,py312,pypy3,pep8,limit,failskip,docs,py39-prefix,py39-limit,py39-verbosity,py39-failskip,py36-pytest,py37-pytest,py38-pytest,py39-pytest,py310-pytest,py311-pytest,py312-pytest
 
 [testenv]
 deps = -r{toxinidir}/requirements.txt
@@ -34,6 +34,12 @@ commands = py.test gabbi
 [testenv:py310-pytest]
 commands = py.test gabbi
 
+[testenv:py311-pytest]
+commands = py.test gabbi
+
+[testenv:py312-pytest]
+commands = py.test gabbi
+
 [testenv:py39-prefix]
 setenv = GABBI_PREFIX=/snoopy