diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index b863c30..142f592 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         include:
           - os: macos-latest
             python-version: "3.10"
@@ -16,6 +16,9 @@ jobs:
           - os: macos-latest
             python-version: "3.11"
             openssl-version: "3"
+          - os: macos-latest
+            python-version: "3.12"
+            openssl-version: "3"
         exclude:
           # test hangs on these combination
           - os: windows-latest
@@ -26,6 +29,8 @@ jobs:
             python-version: "3.10"
           - os: windows-latest
             python-version: "3.11"
+          - os: windows-latest
+            python-version: "3.12"
 
     runs-on: ${{ matrix.os }}
     env:
diff --git a/setup.py b/setup.py
index 48f9a55..4ea0799 100755
--- a/setup.py
+++ b/setup.py
@@ -78,11 +78,12 @@
           'License :: OSI Approved',
           'Operating System :: MacOS :: MacOS X',
           'Operating System :: POSIX',
-          'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: 3.10',
+          'Programming Language :: Python :: 3.11',
+          'Programming Language :: Python :: 3.12',
           'Topic :: Internet',
           'Topic :: Security :: Cryptography',
           'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index cd32e3a..23231d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ skip_missing_interpreters = True
 envlist =
     clean
     report
-    py3{7,8,9,10,11}-{linux,darwin,windows}
+    py3{7,8,9,10,11,12}-{linux,darwin,windows}
 
 [testenv]
 deps =
@@ -53,7 +53,7 @@ commands =
     coverage html
     coverage xml
 depends =
-    py3{7,8,9,10,11}-{linux,darwin,windows}
+    py3{7,8,9,10,11,12}-{linux,darwin,windows}
 
 [pytest]
 testpaths = tests