diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 24faa4b6..12658130 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -200,7 +200,7 @@ jobs:
       timeout-minutes: 5
       run: >
         flux start
-        python -m unittest tests/test_flux_executor.py tests/test_executor_backend_flux.py tests/test_cache_executor_pysqa_flux.py tests/test_plot_dependency_flux.py;
+        python -m unittest tests/test_fluxpythonspawner.py tests/test_fluxjobexecutor_plot.py tests/test_fluxjobexecutor.py tests/test_fluxclusterexecutor.py;
 
   unittest_flux_openmpi:
     needs: [black]
@@ -231,7 +231,7 @@ jobs:
       timeout-minutes: 5
       run: >
         flux start
-        coverage run -a --omit="executorlib/_version.py,tests/*" -m unittest tests/test_flux_executor.py tests/test_executor_backend_flux.py tests/test_cache_executor_pysqa_flux.py tests/test_plot_dependency_flux.py;
+        coverage run -a --omit="executorlib/_version.py,tests/*" -m unittest tests/test_fluxpythonspawner.py tests/test_fluxjobexecutor_plot.py tests/test_fluxjobexecutor.py tests/test_fluxclusterexecutor.py;
         coverage xml
       env:
         EXECUTORLIB_PMIX: "pmix"
diff --git a/tests/test_backend_serial.py b/tests/test_backend_interactive_serial.py
similarity index 100%
rename from tests/test_backend_serial.py
rename to tests/test_backend_interactive_serial.py
diff --git a/tests/test_shared_executorbase.py b/tests/test_base_executor_queue.py
similarity index 100%
rename from tests/test_shared_executorbase.py
rename to tests/test_base_executor_queue.py
diff --git a/tests/test_cache_shared.py b/tests/test_cache_backend_execute.py
similarity index 100%
rename from tests/test_cache_shared.py
rename to tests/test_cache_backend_execute.py
diff --git a/tests/test_cache_executor_mpi.py b/tests/test_cache_fileexecutor_mpi.py
similarity index 100%
rename from tests/test_cache_executor_mpi.py
rename to tests/test_cache_fileexecutor_mpi.py
diff --git a/tests/test_cache_executor_serial.py b/tests/test_cache_fileexecutor_serial.py
similarity index 100%
rename from tests/test_cache_executor_serial.py
rename to tests/test_cache_fileexecutor_serial.py
diff --git a/tests/test_cache_executor_pysqa_flux.py b/tests/test_fluxclusterexecutor.py
similarity index 100%
rename from tests/test_cache_executor_pysqa_flux.py
rename to tests/test_fluxclusterexecutor.py
diff --git a/tests/test_executor_backend_flux.py b/tests/test_fluxjobexecutor.py
similarity index 100%
rename from tests/test_executor_backend_flux.py
rename to tests/test_fluxjobexecutor.py
diff --git a/tests/test_plot_dependency_flux.py b/tests/test_fluxjobexecutor_plot.py
similarity index 100%
rename from tests/test_plot_dependency_flux.py
rename to tests/test_fluxjobexecutor_plot.py
diff --git a/tests/test_flux_executor.py b/tests/test_fluxpythonspawner.py
similarity index 100%
rename from tests/test_flux_executor.py
rename to tests/test_fluxpythonspawner.py
diff --git a/tests/test_local_executor_future.py b/tests/test_interactive_dependencies.py
similarity index 100%
rename from tests/test_local_executor_future.py
rename to tests/test_interactive_dependencies.py
diff --git a/tests/test_pysqa_subprocess.py b/tests/test_interactive_slurmspawner.py
similarity index 100%
rename from tests/test_pysqa_subprocess.py
rename to tests/test_interactive_slurmspawner.py
diff --git a/tests/test_local_executor.py b/tests/test_mpiexecspawner.py
similarity index 100%
rename from tests/test_local_executor.py
rename to tests/test_mpiexecspawner.py
diff --git a/tests/test_cache_executor_interactive.py b/tests/test_singlenodeexecutor_cache.py
similarity index 100%
rename from tests/test_cache_executor_interactive.py
rename to tests/test_singlenodeexecutor_cache.py
diff --git a/tests/test_dependencies_executor.py b/tests/test_singlenodeexecutor_dependencies.py
similarity index 100%
rename from tests/test_dependencies_executor.py
rename to tests/test_singlenodeexecutor_dependencies.py
diff --git a/tests/test_executor_backend_mpi.py b/tests/test_singlenodeexecutor_mpi.py
similarity index 100%
rename from tests/test_executor_backend_mpi.py
rename to tests/test_singlenodeexecutor_mpi.py
diff --git a/tests/test_executor_backend_mpi_noblock.py b/tests/test_singlenodeexecutor_noblock.py
similarity index 100%
rename from tests/test_executor_backend_mpi_noblock.py
rename to tests/test_singlenodeexecutor_noblock.py
diff --git a/tests/test_plot_dependency.py b/tests/test_singlenodeexecutor_plot_dependency.py
similarity index 100%
rename from tests/test_plot_dependency.py
rename to tests/test_singlenodeexecutor_plot_dependency.py
diff --git a/tests/test_local_executor_resize.py b/tests/test_singlenodeexecutor_resize.py
similarity index 100%
rename from tests/test_local_executor_resize.py
rename to tests/test_singlenodeexecutor_resize.py
diff --git a/tests/test_shell_executor.py b/tests/test_singlenodeexecutor_shell_executor.py
similarity index 100%
rename from tests/test_shell_executor.py
rename to tests/test_singlenodeexecutor_shell_executor.py
diff --git a/tests/test_shell_interactive.py b/tests/test_singlenodeexecutor_shell_interactive.py
similarity index 100%
rename from tests/test_shell_interactive.py
rename to tests/test_singlenodeexecutor_shell_interactive.py
diff --git a/tests/test_cache_hdf.py b/tests/test_standalone_hdf.py
similarity index 100%
rename from tests/test_cache_hdf.py
rename to tests/test_standalone_hdf.py
diff --git a/tests/test_shared_input_check.py b/tests/test_standalone_inputcheck.py
similarity index 100%
rename from tests/test_shared_input_check.py
rename to tests/test_standalone_inputcheck.py
diff --git a/tests/test_interactive_future_arguments.py b/tests/test_standalone_interactive_arguments.py
similarity index 100%
rename from tests/test_interactive_future_arguments.py
rename to tests/test_standalone_interactive_arguments.py
diff --git a/tests/test_shared_backend.py b/tests/test_standalone_interactive_backend.py
similarity index 100%
rename from tests/test_shared_backend.py
rename to tests/test_standalone_interactive_backend.py
diff --git a/tests/test_shared_communication.py b/tests/test_standalone_interactive_communication.py
similarity index 100%
rename from tests/test_shared_communication.py
rename to tests/test_standalone_interactive_communication.py