diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4d2eabbd..9e89447c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,10 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {name: Python 3.7, python: 3.7, os: ubuntu}
           - {name: Python 3.8, python: 3.8, os: ubuntu}
-          - {name: Python 3.9, python: 3.9-dev, os: ubuntu}
-          - {name: Python 3.10, python: 3.10.0-beta - 3.10, os: ubuntu}
+          - {name: Python 3.9, python: '3.9', os: ubuntu}
+          - {name: Python 3.10, python: '3.10', os: ubuntu}
+          - {name: Python 3.11, python: '3.11', os: ubuntu}
+          - {name: Python 3.12, python: '3.12', os: ubuntu}
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python }}
diff --git a/setup.cfg b/setup.cfg
index a96cebdc..2e7ea7f6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,10 +16,11 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    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
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: Software Development :: Code Generators
diff --git a/tox.ini b/tox.ini
index 02285b55..acde88aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 # isolated_build = True
-envlist = py37,py38,py39,py310,pypy3
+envlist = py38,py39,py310,py311,py312,pypy3
 skip_missing_interpreters = true
 
 [testenv]
@@ -9,7 +9,7 @@ commands =
     pytest --cov=./nfelib --cov-report=xml
 
 [testenv:build]
-basepython = python3.7
+basepython = python3.8
 skip_install = true
 deps =
     wheel