diff --git a/tests/api/README.md b/tests/integration/README.md
similarity index 100%
rename from tests/api/README.md
rename to tests/integration/README.md
diff --git a/tests/api/__init__.py b/tests/integration/__init__.py
similarity index 100%
rename from tests/api/__init__.py
rename to tests/integration/__init__.py
diff --git a/tests/api/agents/__init__.py b/tests/integration/agents/__init__.py
similarity index 100%
rename from tests/api/agents/__init__.py
rename to tests/integration/agents/__init__.py
diff --git a/tests/api/agents/test_agents.py b/tests/integration/agents/test_agents.py
similarity index 100%
rename from tests/api/agents/test_agents.py
rename to tests/integration/agents/test_agents.py
diff --git a/tests/api/conftest.py b/tests/integration/conftest.py
similarity index 100%
rename from tests/api/conftest.py
rename to tests/integration/conftest.py
diff --git a/tests/api/fixtures/recordable_mock.py b/tests/integration/fixtures/recordable_mock.py
similarity index 100%
rename from tests/api/fixtures/recordable_mock.py
rename to tests/integration/fixtures/recordable_mock.py
diff --git a/tests/api/fixtures/recorded_responses/chat_completion.json b/tests/integration/fixtures/recorded_responses/chat_completion.json
similarity index 100%
rename from tests/api/fixtures/recorded_responses/chat_completion.json
rename to tests/integration/fixtures/recorded_responses/chat_completion.json
diff --git a/tests/api/fixtures/recorded_responses/chat_completion.pickle b/tests/integration/fixtures/recorded_responses/chat_completion.pickle
similarity index 100%
rename from tests/api/fixtures/recorded_responses/chat_completion.pickle
rename to tests/integration/fixtures/recorded_responses/chat_completion.pickle
diff --git a/tests/api/fixtures/recorded_responses/invoke_tool.json b/tests/integration/fixtures/recorded_responses/invoke_tool.json
similarity index 100%
rename from tests/api/fixtures/recorded_responses/invoke_tool.json
rename to tests/integration/fixtures/recorded_responses/invoke_tool.json
diff --git a/tests/api/fixtures/recorded_responses/invoke_tool.pickle b/tests/integration/fixtures/recorded_responses/invoke_tool.pickle
similarity index 100%
rename from tests/api/fixtures/recorded_responses/invoke_tool.pickle
rename to tests/integration/fixtures/recorded_responses/invoke_tool.pickle
diff --git a/tests/api/inference/__init__.py b/tests/integration/inference/__init__.py
similarity index 100%
rename from tests/api/inference/__init__.py
rename to tests/integration/inference/__init__.py
diff --git a/tests/api/inference/dog.png b/tests/integration/inference/dog.png
similarity index 100%
rename from tests/api/inference/dog.png
rename to tests/integration/inference/dog.png
diff --git a/tests/api/inference/test_embedding.py b/tests/integration/inference/test_embedding.py
similarity index 100%
rename from tests/api/inference/test_embedding.py
rename to tests/integration/inference/test_embedding.py
diff --git a/tests/api/inference/test_text_inference.py b/tests/integration/inference/test_text_inference.py
similarity index 100%
rename from tests/api/inference/test_text_inference.py
rename to tests/integration/inference/test_text_inference.py
diff --git a/tests/api/inference/test_vision_inference.py b/tests/integration/inference/test_vision_inference.py
similarity index 100%
rename from tests/api/inference/test_vision_inference.py
rename to tests/integration/inference/test_vision_inference.py
diff --git a/tests/api/metadata.py b/tests/integration/metadata.py
similarity index 100%
rename from tests/api/metadata.py
rename to tests/integration/metadata.py
diff --git a/tests/api/report.py b/tests/integration/report.py
similarity index 100%
rename from tests/api/report.py
rename to tests/integration/report.py
diff --git a/tests/api/safety/__init__.py b/tests/integration/safety/__init__.py
similarity index 100%
rename from tests/api/safety/__init__.py
rename to tests/integration/safety/__init__.py
diff --git a/tests/api/safety/conftest.py b/tests/integration/safety/conftest.py
similarity index 100%
rename from tests/api/safety/conftest.py
rename to tests/integration/safety/conftest.py
diff --git a/tests/api/safety/resources/example_safe.jpg b/tests/integration/safety/resources/example_safe.jpg
similarity index 100%
rename from tests/api/safety/resources/example_safe.jpg
rename to tests/integration/safety/resources/example_safe.jpg
diff --git a/tests/api/safety/resources/example_unsafe.jpg b/tests/integration/safety/resources/example_unsafe.jpg
similarity index 100%
rename from tests/api/safety/resources/example_unsafe.jpg
rename to tests/integration/safety/resources/example_unsafe.jpg
diff --git a/tests/api/safety/test_safety.py b/tests/integration/safety/test_safety.py
similarity index 100%
rename from tests/api/safety/test_safety.py
rename to tests/integration/safety/test_safety.py
diff --git a/tests/api/tool_runtime/test_rag_tool.py b/tests/integration/tool_runtime/test_rag_tool.py
similarity index 100%
rename from tests/api/tool_runtime/test_rag_tool.py
rename to tests/integration/tool_runtime/test_rag_tool.py
diff --git a/tests/api/vector_io/__init__.py b/tests/integration/vector_io/__init__.py
similarity index 100%
rename from tests/api/vector_io/__init__.py
rename to tests/integration/vector_io/__init__.py
diff --git a/tests/api/vector_io/test_vector_io.py b/tests/integration/vector_io/test_vector_io.py
similarity index 100%
rename from tests/api/vector_io/test_vector_io.py
rename to tests/integration/vector_io/test_vector_io.py
diff --git a/tests/unittests/cli/test_stack_config.py b/tests/unit/cli/test_stack_config.py
similarity index 100%
rename from tests/unittests/cli/test_stack_config.py
rename to tests/unit/cli/test_stack_config.py
diff --git a/tests/unittests/models/test_prompt_adapter.py b/tests/unit/models/test_prompt_adapter.py
similarity index 100%
rename from tests/unittests/models/test_prompt_adapter.py
rename to tests/unit/models/test_prompt_adapter.py
diff --git a/tests/unittests/models/test_system_prompts.py b/tests/unit/models/test_system_prompts.py
similarity index 100%
rename from tests/unittests/models/test_system_prompts.py
rename to tests/unit/models/test_system_prompts.py
diff --git a/tests/unittests/rag/fixtures/dummy.pdf b/tests/unit/rag/fixtures/dummy.pdf
similarity index 100%
rename from tests/unittests/rag/fixtures/dummy.pdf
rename to tests/unit/rag/fixtures/dummy.pdf
diff --git a/tests/unittests/rag/test_vector_store.py b/tests/unit/rag/test_vector_store.py
similarity index 100%
rename from tests/unittests/rag/test_vector_store.py
rename to tests/unit/rag/test_vector_store.py
diff --git a/tests/unittests/registry/test_registry.py b/tests/unit/registry/test_registry.py
similarity index 100%
rename from tests/unittests/registry/test_registry.py
rename to tests/unit/registry/test_registry.py
diff --git a/tests/unittests/server/test_logcat.py b/tests/unit/server/test_logcat.py
similarity index 100%
rename from tests/unittests/server/test_logcat.py
rename to tests/unit/server/test_logcat.py
diff --git a/tests/unittests/server/test_replace_env_vars.py b/tests/unit/server/test_replace_env_vars.py
similarity index 100%
rename from tests/unittests/server/test_replace_env_vars.py
rename to tests/unit/server/test_replace_env_vars.py