diff --git a/tests/test_rust_bridge.py b/tests/core/test_rust_bridge.py
similarity index 100%
rename from tests/test_rust_bridge.py
rename to tests/core/test_rust_bridge.py
diff --git a/tests/test_docker.py b/tests/deployment/test_docker.py
similarity index 96%
rename from tests/test_docker.py
rename to tests/deployment/test_docker.py
index 703f7031..ccc3c96f 100644
--- a/tests/test_docker.py
+++ b/tests/deployment/test_docker.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-ROOT = Path(__file__).resolve().parent.parent
+ROOT = Path(__file__).resolve().parent.parent.parent
 DOCKER_DIR = ROOT / "deploy" / "docker"
 
 
diff --git a/tests/test_integration.py b/tests/integration/test_integration.py
similarity index 100%
rename from tests/test_integration.py
rename to tests/integration/test_integration.py
diff --git a/tests/test_integration_extended.py b/tests/integration/test_integration_extended.py
similarity index 100%
rename from tests/test_integration_extended.py
rename to tests/integration/test_integration_extended.py
diff --git a/tests/test_system_learning.py b/tests/learning/test_system_learning.py
similarity index 100%
rename from tests/test_system_learning.py
rename to tests/learning/test_system_learning.py
diff --git a/tests/test_system.py b/tests/sdk/test_system.py
similarity index 100%
rename from tests/test_system.py
rename to tests/sdk/test_system.py