diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
index e85c85f7d..a952e2b06 100644
--- a/.github/workflows/ci_workflows.yml
+++ b/.github/workflows/ci_workflows.yml
@@ -25,27 +25,37 @@ jobs:
             python: 3.x
             toxenv: codestyle
 
-          - name: Python 3.10 with astropy data and coverage
+          - name: Python 3.11 with astropy data and coverage
             os: ubuntu-latest
-            python: '3.10'
-            toxenv: py310-test-cov
+            python: '3.11'
+            toxenv: py311-test-cov
             toxargs: -v
             toxposargs: --remote-data=astropy
 
-          - name: Python 3.8 with oldest supported version of key dependencies
-            os: ubuntu-20.04
-            python: 3.8
-            toxenv: py38-test-oldestdeps
-
-          - name: Python 3.9 (Windows)
+          - name: Python 3.11 (Windows)
             os: windows-latest
+            python: 3.11
+            toxenv: py311-test
+
+          - name: Python 3.11 (MacOS X)
+            os: macos-latest
+            python: 3.11
+            toxenv: py311-test
+
+          - name: Python 3.10
+            os: ubuntu-latest
+            python: '3.10'
+            toxenv: py310-test
+
+          - name: Python 3.9
+            os: ubuntu-latest
             python: 3.9
             toxenv: py39-test
 
-          - name: Python 3.8 (MacOS X)
-            os: macos-latest
+          - name: Python 3.8 with oldest supported version of key dependencies
+            os: ubuntu-20.04
             python: 3.8
-            toxenv: py38-test
+            toxenv: py38-test-oldestdeps
 
     steps:
     - name: Checkout code
@@ -79,10 +89,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: (Allowed Failure) Python 3.11 with remote data and dev version of key dependencies
+          - name: (Allowed Failure) Python 3.12 with remote data and dev version of key dependencies
             os: ubuntu-latest
-            python: '3.11'
-            toxenv: py311-test-devdeps
+            python: '3.12-dev'
+            toxenv: py312-test-devdeps
             toxposargs: --remote-data=any
 
     steps:
diff --git a/tox.ini b/tox.ini
index 7a8101bf7..603ab0308 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{38,39,310,311}-test{,-devdeps,-oldestdeps,-predeps}{,-cov,-external}
+    py{38,39,310,311,312}-test{,-devdeps,-oldestdeps,-predeps}{,-cov,-external}
     linkcheck
     codestyle
 requires =
@@ -66,6 +66,8 @@ extras =
     !oldestdeps: jwst
 
 commands =
+    # Force numpy-dev after matplotlib downgrades it (https://github.com/matplotlib/matplotlib/issues/26847)
+    devdeps: python -m pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
     pip freeze
     !cov: pytest --pyargs specutils {toxinidir}/docs {posargs}
     cov: pytest --pyargs specutils {toxinidir}/docs --cov specutils --cov-config={toxinidir}/setup.cfg {posargs}