diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06c05b02..e61c8926 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,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']
         requests-version: ['"requests>=2.0,<3.0"']
         urllib3-version: ['"urllib3<2"', '"urllib3>=2,<3.0"']
 
diff --git a/CHANGES b/CHANGES
index 6a36026c..cdff7991 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+0.25.0
+------
+
+* Added support for Python 3.12
+
+
 0.24.1
 ------
 
diff --git a/responses/tests/test_recorder.py b/responses/tests/test_recorder.py
index 4508bb9a..b195088e 100644
--- a/responses/tests/test_recorder.py
+++ b/responses/tests/test_recorder.py
@@ -12,7 +12,7 @@
 try:
     import tomli as _toml
 except ImportError:
-    # python 3.11
+    # python 3.11+
     import tomllib as _toml  # type: ignore[no-redef]
 
 
diff --git a/setup.py b/setup.py
index 1dd25f00..a7e50202 100644
--- a/setup.py
+++ b/setup.py
@@ -93,6 +93,7 @@ def run_tests(self):
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Software Development",
     ],
 )
diff --git a/tox.ini b/tox.ini
index 15601559..d7dd4860 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38,py39,py310,py311,mypy,precom
+envlist = py38,py39,py310,py311,py312,mypy,precom
 
 [pytest]
 filterwarnings =