diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 1cf073c..03b4b48 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -57,7 +57,15 @@ jobs:
           - os: ubuntu-latest
             python-version: '3.11'
             toxenv: py311-test-pytest74
-            toxargs: --pre
+          - os: ubuntu-latest
+            python-version: '3.12'
+            toxenv: py312-test-pytest80
+          - os: macos-latest
+            python-version: '3.12'
+            toxenv: py312-test-pytest80
+          - os: windows-latest
+            python-version: '3.12'
+            toxenv: py312-test-pytest80
           - os: macos-latest
             python-version: '3.11'
             toxenv: py311-test-pytestdev
diff --git a/tox.ini b/tox.ini
index 8c8c98d..88de185 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,12 +26,18 @@ deps =
     pytest72: pytest==7.2.*
     pytest73: pytest==7.3.*
     pytest74: pytest==7.4.*
+    pytest80: pytest==8.0.*
     pytestdev: git+https://github.com/pytest-dev/pytest#egg=pytest
     numpydev: numpy>=0.0.dev0
 
 extras =
     test
 
+# Temporary measures to be able to test on 8.0.x in its RC cycle
+pip_pre =
+    pytest80: true
+    !pytest80: false
+
 commands =
     pip freeze
     # Ignore directly running tests in ``skip_some_remote_data.rst`` with