diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index b47f93bb2c8..36f7b9a137f 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -125,7 +125,7 @@ jobs:
     needs: gen_llhttp
     strategy:
       matrix:
-        pyver: [3.8, 3.9, '3.10']
+        pyver: [3.8, 3.9, '3.10', '3.11', '3.12']
         no-extensions: ['', 'Y']
         os: [ubuntu, macos, windows]
         experimental: [false]
@@ -141,28 +141,8 @@ jobs:
             no-extensions: 'Y'
             os: ubuntu
             experimental: false
-          - os: macos
-            pyver: "3.11"
-            experimental: true
-            no-extensions: 'Y'
           - os: ubuntu
-            pyver: "3.11"
-            experimental: false
-            no-extensions: 'Y'
-          - os: windows
-            pyver: "3.11"
-            experimental: true
-            no-extensions: 'Y'
-          - os: ubuntu
-            pyver: "3.12"
-            experimental: true
-            no-extensions: 'Y'
-          - os: macos
-            pyver: "3.12"
-            experimental: true
-            no-extensions: 'Y'
-          - os: windows
-            pyver: "3.12"
+            pyver: "3.13"
             experimental: true
             no-extensions: 'Y'
       fail-fast: true
diff --git a/setup.cfg b/setup.cfg
index 83da3961014..c514bab9f94 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,6 +36,8 @@ classifiers =
   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 :: WWW/HTTP