diff --git a/llama_stack/cli/tests/test_stack_config.py b/tests/cli/test_stack_config.py
similarity index 100%
rename from llama_stack/cli/tests/test_stack_config.py
rename to tests/cli/test_stack_config.py
diff --git a/llama_stack/models/llama/llama3/test_system_prompts.py b/tests/models/test_system_prompts.py
similarity index 100%
rename from llama_stack/models/llama/llama3/test_system_prompts.py
rename to tests/models/test_system_prompts.py
diff --git a/llama_stack/distribution/store/tests/test_registry.py b/tests/registry/test_registry.py
similarity index 100%
rename from llama_stack/distribution/store/tests/test_registry.py
rename to tests/registry/test_registry.py
diff --git a/tests/test_logcat.py b/tests/server/test_logcat.py
similarity index 100%
rename from tests/test_logcat.py
rename to tests/server/test_logcat.py
diff --git a/tests/test_replace_env_vars.py b/tests/server/test_replace_env_vars.py
similarity index 100%
rename from tests/test_replace_env_vars.py
rename to tests/server/test_replace_env_vars.py