diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 8a5ae22..0c8d534 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -30,12 +30,28 @@ jobs:
             manylinux-version: "2010"
           - python: "3.11"
             multibuild-sha: "34e970c4bc448b73af0127615fc4583b4f247369"
+          - python: "3.12"
+            manylinux-version: "2010"
+          - python: "3.12"
+            multibuild-sha: "34e970c4bc448b73af0127615fc4583b4f247369"
         include:
           - os: "macos-11"
             os-name: "osx"
           - os: "ubuntu-20.04"
             manylinux-version: "2010"
             os-name: "manylinux2010"
+          - python: "3.11"
+            os: "ubuntu-20.04"
+            manylinux-version: "2014"
+            os-name: "manylinux2014"
+          - python: "3.12"
+            os: "ubuntu-20.04"
+            manylinux-version: "2014"
+            os-name: "manylinux2014"
+          - python: "3.11"
+            multibuild-sha: "34e970c4bc448b73af0127615fc4583b4f247369"
+          - python: "3.12"
+            multibuild-sha: "34e970c4bc448b73af0127615fc4583b4f247369"
           - os: "macos-11"
             os-name: "osx"
             platform: "arm64"
@@ -94,37 +110,7 @@ jobs:
             os: "ubuntu-20.04"
             os-name: "manylinux2014"
             manylinux-version: "2014"
-          - python: "3.11"
-            platform: "x86_64"
-            os: "macos-11"
-            os-name: "osx"
-            macos-target: "10.10"
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
-          - python: "3.11"
-            platform: "arm64"
-            os: "macos-11"
-            os-name: "osx"
-            macos-target: "11.0"
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
-          - python: "3.11"
-            platform: "x86_64"
-            mb-ml-libc: "musllinux"
-            os: "ubuntu-20.04"
-            os-name: "musllinux"
-            manylinux-version: ""
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
-          - python: "3.11"
-            platform: "aarch64"
-            os: "ubuntu-20.04"
-            os-name: "manylinux2014"
-            manylinux-version: "2014"
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
-          - python: "3.11"
-            platform: "x86_64"
-            os: "ubuntu-20.04"
-            os-name: "manylinux2014"
-            manylinux-version: "2014"
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
+
     env:
       BUILD_COMMIT: HEAD
       PLAT: ${{ matrix.platform }}
@@ -205,7 +191,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        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"]
         architecture: ["x64"]
         include:
           - architecture: "x64"
diff --git a/tox.ini b/tox.ini
index d5215e6..4fd58f5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,37,38,39,310,py37}
+envlist = py{27,37,38,39,310,311,312,py37}
 minversion = 1.9
 
 [gh-actions]
@@ -10,6 +10,8 @@ python =
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
+    3.12: py312
     pypy-3.7: pypy37
 
 [testenv]