diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 098aaf10..c21c002e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
       with:
         platforms: arm64
     - name: Build wheels
-      uses: pypa/cibuildwheel@v2.11.2
+      uses: pypa/cibuildwheel@v2.14.1
       env:
         CIBW_SKIP: pp*
         CIBW_ARCHS: auto64
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8eeb8bc0..cfc3fcb0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,29 +10,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.7", "pypy-3.8"]
-        exclude:
+        os: [ubuntu-latest]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.10"]
+        include:
         - os: macos-latest
-          python-version: "3.8"
+          python-version: "3.7"
         - os: macos-latest
-          python-version: "3.9"
-        - os: macos-latest
-          python-version: "3.10"
-        - os: macos-latest
-          python-version: "pypy-3.7"
-        - os: macos-latest
-          python-version: "pypy-3.8"
-        - os: windows-latest
-          python-version: "3.8"
-        - os: windows-latest
-          python-version: "3.9"
-        - os: windows-latest
-          python-version: "3.10"
+          python-version: "3.12"
         - os: windows-latest
-          python-version: "pypy-3.7"
+          python-version: "3.7"
         - os: windows-latest
-          python-version: "pypy-3.8"
+          python-version: "3.12"
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -40,6 +28,7 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
         cache: pip
         cache-dependency-path: pyproject.toml
     - name: Install dependencies
diff --git a/docs/versionhistory.rst b/docs/versionhistory.rst
index edc2932a..ffe25dab 100644
--- a/docs/versionhistory.rst
+++ b/docs/versionhistory.rst
@@ -5,6 +5,10 @@ Version history
 
 This library adheres to `Semantic Versioning <http://semver.org/>`_.
 
+**UNRELEASED**
+
+- Added support for Python 3.12
+
 **5.4.6** (2022-12-07)
 
 - Fix MemoryError when decoding Tags on 32bit architecture. (Sekenre)
diff --git a/pyproject.toml b/pyproject.toml
index 1c867a27..3e969ef1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,6 +24,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 requires-python = ">= 3.7"
 dynamic = ["version"]
@@ -74,7 +75,7 @@ show_missing = true
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py37, py38, py39, py310, py311, pypy3
+envlist = py37, py38, py39, py310, py311, py312, pypy3
 skip_missing_interpreters = true
 isolated_build = true