diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 5618306b3..566cb722e 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -106,4 +106,4 @@ jobs:
 
           python -m pytest $PYTEST_ARGS \
             --pyargs "openff.toolkit" \
-            -m "slow or not slow"
+            -m "slow or not slow" -x
diff --git a/devtools/conda-envs/conda.yaml b/devtools/conda-envs/conda.yaml
index 0c64bc009..3193ed308 100644
--- a/devtools/conda-envs/conda.yaml
+++ b/devtools/conda-envs/conda.yaml
@@ -5,7 +5,7 @@ dependencies:
     # Base depends
   - openff-toolkit-examples
     # Tests
-  - pytest=7.4
+  - pytest=8
   - pytest-rerunfailures
   - nbval
   - parmed=3
diff --git a/devtools/conda-envs/conda_oe.yaml b/devtools/conda-envs/conda_oe.yaml
index ad491db0a..ad6f94b1f 100644
--- a/devtools/conda-envs/conda_oe.yaml
+++ b/devtools/conda-envs/conda_oe.yaml
@@ -7,7 +7,7 @@ dependencies:
   - openff-toolkit-examples
     # Tests
   - openeye-toolkits
-  - pytest=7.4
+  - pytest=8
   - pytest-rerunfailures
   - nbval
   - parmed=3