diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 04affc5c9..7de90d9f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,15 +70,6 @@ jobs:
         - macos: py39-parallel
         - windows: py39-parallel
 
-
-  dev312:
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
-    with:
-      submodules: false
-      default_python: '3.12-dev'
-      envs: |
-        - linux: devdeps
-
   dev:
     needs: [core, asdf-schemas]
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
@@ -90,6 +81,8 @@ jobs:
         - linux: py39-devdeps-parallel
         - linux: py310-devdeps-parallel
         - linux: py311-devdeps-parallel
+        - linux: py312-devdeps-parallel
+          python-version: '3.12-dev'
 
   oldest:
     needs: [core, asdf-schemas]
diff --git a/tox.ini b/tox.ini
index e2f185082..b028c2aa1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ env_list =
     compatibility
     coverage
     devdep{,-parallel}
-    py{39,310,311}{,-compatibility,-coverage,-jsonschema}{,-parallel}
+    py{39,310,311,312}{,-compatibility,-coverage,-jsonschema}{,-parallel}
     asdf{-standard,-transform-schemas,-unit-schemas,-wcs-schemas,-coordinates-schemas,-astropy}
     gwcs
     jwst
@@ -29,6 +29,8 @@ extras = all,tests
 pass_env = HOME
 package = editable
 commands_pre =
+# the released aiohttp (used by fsspec) is not compatible with 3.12
+    devdeps: pip install git+https://github.com/aio-libs/aiohttp.git
     python -m pip install --upgrade pip
 
 # Generate `requiremments-min.txt`