diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ceecb95..930abcc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, windows-latest]
         exclude:
           - os: windows-latest
@@ -16,7 +16,9 @@ jobs:
           - os: windows-latest
             python-version: "3.9"
           - os: windows-latest
-            python-version: "3.11"
+            python-version: "3.10"
+          - os: windows-latest
+            python-version: "3.12"
 
     steps:
       - uses: actions/checkout@v3
diff --git a/setup.py b/setup.py
index 3531daa..5752611 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,7 @@
 
 install_aiohttp_requires = [
     "aiohttp>=3.8,<4",
+    "aiohttp>=3.9,<4; python_version >= '3.12'",
 ]
 
 install_quart_requires = ["quart>=0.15,<1"]
@@ -72,6 +73,7 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "License :: OSI Approved :: MIT License",
     ],
     keywords="api graphql protocol rest",
diff --git a/tox.ini b/tox.ini
index b44f66b..48681aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     pre-commit,mypy,
-    py{38,39,310,311}
+    py{38,39,310,311,312}
 ; requires = tox-conda
 
 [gh-actions]
@@ -10,6 +10,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [testenv]
 conda_channels = conda-forge
@@ -22,7 +23,7 @@ whitelist_externals =
     python
 commands =
     pip install -U setuptools
-    py{38,39,310}: pytest tests {posargs}
+    py{38,39,310,312}: pytest tests {posargs}
     py{311}: pytest tests --cov-report=term-missing --cov=graphql_server {posargs}
 
 [testenv:pre-commit]