diff --git a/tests/executor/__init__.py b/tests/executor/__init__.py
deleted file mode 100644
index 8339d5d..0000000
--- a/tests/executor/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests for executor package."""
diff --git a/tests/routes/__init__.py b/tests/integration/__init__.py
similarity index 100%
rename from tests/routes/__init__.py
rename to tests/integration/__init__.py
diff --git a/tests/integration/routes/__init__.py b/tests/integration/routes/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/routes/test_csv.py b/tests/integration/routes/test_csv.py
similarity index 100%
rename from tests/routes/test_csv.py
rename to tests/integration/routes/test_csv.py
diff --git a/tests/routes/test_health.py b/tests/integration/routes/test_health.py
similarity index 100%
rename from tests/routes/test_health.py
rename to tests/integration/routes/test_health.py
diff --git a/tests/routes/test_probe.py b/tests/integration/routes/test_probe.py
similarity index 100%
rename from tests/routes/test_probe.py
rename to tests/integration/routes/test_probe.py
diff --git a/tests/routes/test_report.py b/tests/integration/routes/test_report.py
similarity index 100%
rename from tests/routes/test_report.py
rename to tests/integration/routes/test_report.py
diff --git a/tests/routes/test_static.py b/tests/integration/routes/test_static.py
similarity index 100%
rename from tests/routes/test_static.py
rename to tests/integration/routes/test_static.py
diff --git a/tests/system/__init__.py b/tests/system/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_lib.py b/tests/system/test_lib.py
similarity index 100%
rename from tests/test_lib.py
rename to tests/system/test_lib.py
diff --git a/tests/test_registry.py b/tests/system/test_registry.py
similarity index 100%
rename from tests/test_registry.py
rename to tests/system/test_registry.py
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/unit/executor/__init__.py b/tests/unit/executor/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/executor/test_circuit_breaker.py b/tests/unit/executor/test_circuit_breaker.py
similarity index 100%
rename from tests/executor/test_circuit_breaker.py
rename to tests/unit/executor/test_circuit_breaker.py
diff --git a/tests/executor/test_concurrent.py b/tests/unit/executor/test_concurrent.py
similarity index 100%
rename from tests/executor/test_concurrent.py
rename to tests/unit/executor/test_concurrent.py
diff --git a/tests/executor/test_rate_limiter.py b/tests/unit/executor/test_rate_limiter.py
similarity index 100%
rename from tests/executor/test_rate_limiter.py
rename to tests/unit/executor/test_rate_limiter.py
diff --git a/tests/unit/probe_actor/__init__.py b/tests/unit/probe_actor/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/probe_actor/test_fuzzer.py b/tests/unit/probe_actor/test_fuzzer.py
similarity index 100%
rename from tests/probe_actor/test_fuzzer.py
rename to tests/unit/probe_actor/test_fuzzer.py
diff --git a/tests/probe_actor/test_refusal.py b/tests/unit/probe_actor/test_refusal.py
similarity index 100%
rename from tests/probe_actor/test_refusal.py
rename to tests/unit/probe_actor/test_refusal.py
diff --git a/tests/unit/probe_data/__init__.py b/tests/unit/probe_data/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/probe_data/test_unified_loader.py b/tests/unit/probe_data/test_unified_loader.py
similarity index 100%
rename from tests/probe_data/test_unified_loader.py
rename to tests/unit/probe_data/test_unified_loader.py
diff --git a/tests/unit/refusal_classifier/__init__.py b/tests/unit/refusal_classifier/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/refusal_classifier/test_model.py b/tests/unit/refusal_classifier/test_model.py
similarity index 100%
rename from tests/refusal_classifier/test_model.py
rename to tests/unit/refusal_classifier/test_model.py
diff --git a/tests/test_cache_config.py b/tests/unit/test_cache_config.py
similarity index 100%
rename from tests/test_cache_config.py
rename to tests/unit/test_cache_config.py
diff --git a/tests/test_dependencies.py b/tests/unit/test_dependencies.py
similarity index 100%
rename from tests/test_dependencies.py
rename to tests/unit/test_dependencies.py
diff --git a/tests/test_mcp.py b/tests/unit/test_mcp.py
similarity index 100%
rename from tests/test_mcp.py
rename to tests/unit/test_mcp.py
diff --git a/tests/test_spec.py b/tests/unit/test_spec.py
similarity index 100%
rename from tests/test_spec.py
rename to tests/unit/test_spec.py