diff --git a/.github/workflows/roman_ci.yml b/.github/workflows/roman_ci.yml
index 9355430f6..2fd7cf87c 100644
--- a/.github/workflows/roman_ci.yml
+++ b/.github/workflows/roman_ci.yml
@@ -47,16 +47,16 @@ jobs:
       cache-key: data-${{ needs.data.outputs.webbpsf_hash }}-${{ needs.data.outputs.crds_context }}
       cache-restore-keys: webbpsf-${{ needs.data.outputs.webbpsf_hash }}
       envs: |
-        - linux: py39-oldestdeps-cov
+        - linux: py39-oldestdeps-webbpsf-cov
           pytest-results-summary: true
-        - linux: py39
+        - linux: py39-webbpsf
           pytest-results-summary: true
-        - linux: py310
+        - linux: py310-webbpsf
           pytest-results-summary: true
-        - linux: py311-ddtrace
+        - linux: py311-ddtrace-webbpsf
           pytest-results-summary: true
-        - macos: py311-ddtrace
+        - macos: py311-ddtrace-webbpsf
           pytest-results-summary: true
-        - linux: py311-cov
+        - linux: py311-webbpsf-cov
           coverage: codecov
           pytest-results-summary: true
diff --git a/.github/workflows/roman_ci_cron.yaml b/.github/workflows/roman_ci_cron.yaml
index cb74f9217..c404f9567 100644
--- a/.github/workflows/roman_ci_cron.yaml
+++ b/.github/workflows/roman_ci_cron.yaml
@@ -40,11 +40,11 @@ jobs:
       cache-key: data-${{ needs.data.outputs.webbpsf_hash }}-${{ needs.data.outputs.crds_context }}
       cache-restore-keys: webbpsf-${{ needs.data.outputs.webbpsf_hash }}
       envs: |
-        - macos: py39
+        - macos: py39-webbpsf
           pytest-results-summary: true
-        - macos: py310
+        - macos: py310-webbpsf
           pytest-results-summary: true
-        - macos: py311-sdpdeps
+        - macos: py311-sdpdeps-webbpsf
           pytest-results-summary: true
-        - linux: py3-pyargs
+        - linux: py3-pyargs-webbpsf
           pytest-results-summary: true
diff --git a/.github/workflows/tests_devdeps.yml b/.github/workflows/tests_devdeps.yml
index 485dd1012..997280f16 100644
--- a/.github/workflows/tests_devdeps.yml
+++ b/.github/workflows/tests_devdeps.yml
@@ -42,13 +42,13 @@ jobs:
       cache-key: data-${{ needs.data.outputs.webbpsf_hash }}-${{ needs.data.outputs.crds_context }}
       cache-restore-keys: webbpsf-${{ needs.data.outputs.webbpsf_hash }}
       envs: |
-        - linux: py39-devdeps
-        - macos: py39-devdeps
-        - linux: py310-devdeps
-        - macos: py310-devdeps
-        - linux: py311-devdeps
-        - macos: py311-devdeps
-        - linux: py3-devdeps
+        - linux: py39-devdeps-webbpsf
+        - macos: py39-devdeps-webbpsf
+        - linux: py310-devdeps-webbpsf
+        - macos: py310-devdeps-webbpsf
+        - linux: py311-devdeps-webbpsf
+        - macos: py311-devdeps-webbpsf
+        - linux: py3-devdeps-webbpsf
           pytest-results-summary: true
-        - macos: py3-devdeps
+        - macos: py3-devdeps-webbpsf
           pytest-results-summary: true
diff --git a/JenkinsfileRT b/JenkinsfileRT
index 33edc010c..8636d3561 100644
--- a/JenkinsfileRT
+++ b/JenkinsfileRT
@@ -97,7 +97,7 @@ bc0.build_cmds = bc0.build_cmds + [
     "pip list"
 ]
 bc0.test_cmds = [
-    "pytest -r sxf -n auto --bigdata --slow \
+    "pytest -r sxf -n auto --bigdata --slow --webbpsf \
     --cov --cov-report=xml:coverage.xml \
     --ddtrace \
     --basetemp=${pytest_basetemp} --junit-xml=results.xml --dist=loadscope \
diff --git a/JenkinsfileRT_dev b/JenkinsfileRT_dev
index 60688491f..886b62510 100644
--- a/JenkinsfileRT_dev
+++ b/JenkinsfileRT_dev
@@ -91,7 +91,7 @@ bc0.build_cmds = bc0.build_cmds + [
     "pip list"
 ]
 bc0.test_cmds = [
-    "pytest -r sxf -n 0 --bigdata --slow \
+    "pytest -r sxf -n 0 --bigdata --slow --webbpsf \
     --basetemp=${pytest_basetemp} --junit-xml=results.xml --dist=loadscope \
     --env=${artifactoryenv} ${pytest_args}",
 ]
diff --git a/tox.ini b/tox.ini
index 1d7ac3f62..9766e5c94 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 env_list =
     check-{style,dependencies,build}
-    test{,-alldeps,-devdeps}{,-pyargs,-warnings,-regtests,-cov}
+    test{,-alldeps,-devdeps}{,-pyargs,-warnings,-regtests,-cov,-webbpsf}
     test-numpy{120,121,122}-xdist
     build-{docs,dist}
 
@@ -46,6 +46,7 @@ description =
     cov: with coverage
     xdist: using parallel processing
     ddtrace: passing test traces to DataDog agent
+    webbpsf: run the webbpsf tests
 pass_env =
     HOME
     CI
@@ -77,6 +78,7 @@ commands =
     xdist: -n 0 \
     pyargs: {toxinidir}/docs --pyargs {posargs:romancal} \
     ddtrace: --ddtrace \
+    webbpsf: --webbpsf \
     {posargs}
 
 [testenv:build-docs]