diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index b07c4ab..998d2b2 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/setup.py b/setup.py
index 37d1cde..39f2b53 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,8 @@
 ]
 
 tornado_requires = [
-    "tornado>=4.0,<6.0",
+    "tornado>=4.0,<7.0; python_version>='3.12'",
+    "tornado>=4.0,<6.0; python_version<'3.12'",
 ]
 
 try: