diff --git a/backend/tests/test_cases/test_auth_router.py b/backend/tests/test_cases/auth/test_auth_router.py
similarity index 100%
rename from backend/tests/test_cases/test_auth_router.py
rename to backend/tests/test_cases/auth/test_auth_router.py
diff --git a/backend/tests/test_cases/test_free_trial.py b/backend/tests/test_cases/auth/test_free_trial.py
similarity index 100%
rename from backend/tests/test_cases/test_free_trial.py
rename to backend/tests/test_cases/auth/test_free_trial.py
diff --git a/backend/tests/test_cases/test_browser_agent_loop.py b/backend/tests/test_cases/browser/test_browser_agent_loop.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_agent_loop.py
rename to backend/tests/test_cases/browser/test_browser_agent_loop.py
diff --git a/backend/tests/test_cases/test_browser_batch_replay.py b/backend/tests/test_cases/browser/test_browser_batch_replay.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_batch_replay.py
rename to backend/tests/test_cases/browser/test_browser_batch_replay.py
diff --git a/backend/tests/test_cases/test_browser_command_timeout.py b/backend/tests/test_cases/browser/test_browser_command_timeout.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_command_timeout.py
rename to backend/tests/test_cases/browser/test_browser_command_timeout.py
diff --git a/backend/tests/test_cases/test_browser_fast_path.py b/backend/tests/test_cases/browser/test_browser_fast_path.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_fast_path.py
rename to backend/tests/test_cases/browser/test_browser_fast_path.py
diff --git a/backend/tests/test_cases/test_browser_hints.py b/backend/tests/test_cases/browser/test_browser_hints.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_hints.py
rename to backend/tests/test_cases/browser/test_browser_hints.py
diff --git a/backend/tests/test_cases/test_browser_hotpath_waste.py b/backend/tests/test_cases/browser/test_browser_hotpath_waste.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_hotpath_waste.py
rename to backend/tests/test_cases/browser/test_browser_hotpath_waste.py
diff --git a/backend/tests/test_cases/test_browser_memory_endpoints.py b/backend/tests/test_cases/browser/test_browser_memory_endpoints.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_memory_endpoints.py
rename to backend/tests/test_cases/browser/test_browser_memory_endpoints.py
diff --git a/backend/tests/test_cases/test_browser_meta_playbook.py b/backend/tests/test_cases/browser/test_browser_meta_playbook.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_meta_playbook.py
rename to backend/tests/test_cases/browser/test_browser_meta_playbook.py
diff --git a/backend/tests/test_cases/test_browser_metrics.py b/backend/tests/test_cases/browser/test_browser_metrics.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_metrics.py
rename to backend/tests/test_cases/browser/test_browser_metrics.py
diff --git a/backend/tests/test_cases/test_browser_orchestrator_routing.py b/backend/tests/test_cases/browser/test_browser_orchestrator_routing.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_orchestrator_routing.py
rename to backend/tests/test_cases/browser/test_browser_orchestrator_routing.py
diff --git a/backend/tests/test_cases/test_browser_playbook.py b/backend/tests/test_cases/browser/test_browser_playbook.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_playbook.py
rename to backend/tests/test_cases/browser/test_browser_playbook.py
diff --git a/backend/tests/test_cases/test_browser_save.py b/backend/tests/test_cases/browser/test_browser_save.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_save.py
rename to backend/tests/test_cases/browser/test_browser_save.py
diff --git a/backend/tests/test_cases/test_browser_screenshot_prune.py b/backend/tests/test_cases/browser/test_browser_screenshot_prune.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_screenshot_prune.py
rename to backend/tests/test_cases/browser/test_browser_screenshot_prune.py
diff --git a/backend/tests/test_cases/test_browser_self_audit.py b/backend/tests/test_cases/browser/test_browser_self_audit.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_self_audit.py
rename to backend/tests/test_cases/browser/test_browser_self_audit.py
diff --git a/backend/tests/test_cases/test_browser_skills.py b/backend/tests/test_cases/browser/test_browser_skills.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_skills.py
rename to backend/tests/test_cases/browser/test_browser_skills.py
diff --git a/backend/tests/test_cases/test_browser_stagnation.py b/backend/tests/test_cases/browser/test_browser_stagnation.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_stagnation.py
rename to backend/tests/test_cases/browser/test_browser_stagnation.py
diff --git a/backend/tests/test_cases/test_browser_validator.py b/backend/tests/test_cases/browser/test_browser_validator.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_validator.py
rename to backend/tests/test_cases/browser/test_browser_validator.py
diff --git a/backend/tests/test_cases/test_browser_wait.py b/backend/tests/test_cases/browser/test_browser_wait.py
similarity index 100%
rename from backend/tests/test_cases/test_browser_wait.py
rename to backend/tests/test_cases/browser/test_browser_wait.py
diff --git a/backend/tests/test_cases/test_skill_metrics_and_analyzer.py b/backend/tests/test_cases/browser/test_skill_metrics_and_analyzer.py
similarity index 100%
rename from backend/tests/test_cases/test_skill_metrics_and_analyzer.py
rename to backend/tests/test_cases/browser/test_skill_metrics_and_analyzer.py
diff --git a/backend/tests/test_cases/test_clean_short_label.py b/backend/tests/test_cases/labeling/test_clean_short_label.py
similarity index 100%
rename from backend/tests/test_cases/test_clean_short_label.py
rename to backend/tests/test_cases/labeling/test_clean_short_label.py
diff --git a/backend/tests/test_cases/test_v2_invariants.py b/backend/tests/test_cases/labeling/test_v2_invariants.py
similarity index 100%
rename from backend/tests/test_cases/test_v2_invariants.py
rename to backend/tests/test_cases/labeling/test_v2_invariants.py
diff --git a/backend/tests/test_cases/test_v2_label_logic.py b/backend/tests/test_cases/labeling/test_v2_label_logic.py
similarity index 100%
rename from backend/tests/test_cases/test_v2_label_logic.py
rename to backend/tests/test_cases/labeling/test_v2_label_logic.py
diff --git a/backend/tests/test_cases/test_disconnect_resilience.py b/backend/tests/test_cases/service/test_disconnect_resilience.py
similarity index 99%
rename from backend/tests/test_cases/test_disconnect_resilience.py
rename to backend/tests/test_cases/service/test_disconnect_resilience.py
index 330d9aa8..b573c081 100644
--- a/backend/tests/test_cases/test_disconnect_resilience.py
+++ b/backend/tests/test_cases/service/test_disconnect_resilience.py
@@ -22,7 +22,7 @@ message, completed). That keeps the test fast (>200 iterations in
 seconds) and self-contained.
 
 Run:
-    cd backend && .venv/bin/python -m pytest tests/test_disconnect_resilience.py -v
+    cd backend && .venv/bin/python -m pytest tests/test_cases/service/test_disconnect_resilience.py -v
 """
 
 from __future__ import annotations
diff --git a/backend/tests/test_cases/test_disk_caches.py b/backend/tests/test_cases/service/test_disk_caches.py
similarity index 100%
rename from backend/tests/test_cases/test_disk_caches.py
rename to backend/tests/test_cases/service/test_disk_caches.py
diff --git a/backend/tests/test_cases/test_disk_resilience.py b/backend/tests/test_cases/service/test_disk_resilience.py
similarity index 100%
rename from backend/tests/test_cases/test_disk_resilience.py
rename to backend/tests/test_cases/service/test_disk_resilience.py
diff --git a/backend/tests/test_cases/test_ghost_detector.py b/backend/tests/test_cases/service/test_ghost_detector.py
similarity index 100%
rename from backend/tests/test_cases/test_ghost_detector.py
rename to backend/tests/test_cases/service/test_ghost_detector.py
diff --git a/backend/tests/test_cases/test_outputs_runtime_cleanup.py b/backend/tests/test_cases/service/test_outputs_runtime_cleanup.py
similarity index 100%
rename from backend/tests/test_cases/test_outputs_runtime_cleanup.py
rename to backend/tests/test_cases/service/test_outputs_runtime_cleanup.py
diff --git a/backend/tests/test_cases/test_phase1_stress.py b/backend/tests/test_cases/service/test_phase1_stress.py
similarity index 100%
rename from backend/tests/test_cases/test_phase1_stress.py
rename to backend/tests/test_cases/service/test_phase1_stress.py
diff --git a/backend/tests/test_cases/test_service.py b/backend/tests/test_cases/service/test_service.py
similarity index 99%
rename from backend/tests/test_cases/test_service.py
rename to backend/tests/test_cases/service/test_service.py
index 4cd6c340..b463483f 100644
--- a/backend/tests/test_cases/test_service.py
+++ b/backend/tests/test_cases/service/test_service.py
@@ -10,7 +10,7 @@ opaque dicts; the cloud determines what they are. Tests verify:
   - Legacy shims (submit, record, identify) route through sync
 
 Run:
-    cd backend && python -m pytest tests/test_service.py -v
+    cd backend && python -m pytest tests/test_cases/service/test_service.py -v
 """
 
 from __future__ import annotations
diff --git a/backend/tests/test_cases/test_settings_migration.py b/backend/tests/test_cases/settings/test_settings_migration.py
similarity index 100%
rename from backend/tests/test_cases/test_settings_migration.py
rename to backend/tests/test_cases/settings/test_settings_migration.py
diff --git a/backend/tests/test_cases/test_settings_server_owned.py b/backend/tests/test_cases/settings/test_settings_server_owned.py
similarity index 100%
rename from backend/tests/test_cases/test_settings_server_owned.py
rename to backend/tests/test_cases/settings/test_settings_server_owned.py
diff --git a/backend/tests/test_cases/test_web_search_cascade.py b/backend/tests/test_cases/web_search/test_web_search_cascade.py
similarity index 100%
rename from backend/tests/test_cases/test_web_search_cascade.py
rename to backend/tests/test_cases/web_search/test_web_search_cascade.py
diff --git a/backend/tests/test_cases/test_web_search_ddg.py b/backend/tests/test_cases/web_search/test_web_search_ddg.py
similarity index 100%
rename from backend/tests/test_cases/test_web_search_ddg.py
rename to backend/tests/test_cases/web_search/test_web_search_ddg.py
diff --git a/backend/tests/test_cases/test_web_search_reliability.py b/backend/tests/test_cases/web_search/test_web_search_reliability.py
similarity index 100%
rename from backend/tests/test_cases/test_web_search_reliability.py
rename to backend/tests/test_cases/web_search/test_web_search_reliability.py