diff --git a/model-providers/tests/deepseek_providers_test/model_providers.yaml b/model-providers/tests/integration_tests/deepseek_providers_test/model_providers.yaml
similarity index 100%
rename from model-providers/tests/deepseek_providers_test/model_providers.yaml
rename to model-providers/tests/integration_tests/deepseek_providers_test/model_providers.yaml
diff --git a/model-providers/tests/deepseek_providers_test/test_deepseek_service.py b/model-providers/tests/integration_tests/deepseek_providers_test/test_deepseek_service.py
similarity index 100%
rename from model-providers/tests/deepseek_providers_test/test_deepseek_service.py
rename to model-providers/tests/integration_tests/deepseek_providers_test/test_deepseek_service.py
diff --git a/model-providers/tests/ollama_providers_test/model_providers.yaml b/model-providers/tests/integration_tests/ollama_providers_test/model_providers.yaml
similarity index 100%
rename from model-providers/tests/ollama_providers_test/model_providers.yaml
rename to model-providers/tests/integration_tests/ollama_providers_test/model_providers.yaml
diff --git a/model-providers/tests/ollama_providers_test/test_ollama_service.py b/model-providers/tests/integration_tests/ollama_providers_test/test_ollama_service.py
similarity index 100%
rename from model-providers/tests/ollama_providers_test/test_ollama_service.py
rename to model-providers/tests/integration_tests/ollama_providers_test/test_ollama_service.py
diff --git a/model-providers/tests/openai_providers_test/model_providers.yaml b/model-providers/tests/integration_tests/openai_providers_test/model_providers.yaml
similarity index 100%
rename from model-providers/tests/openai_providers_test/model_providers.yaml
rename to model-providers/tests/integration_tests/openai_providers_test/model_providers.yaml
diff --git a/model-providers/tests/openai_providers_test/test_ollama_service.py b/model-providers/tests/integration_tests/openai_providers_test/test_ollama_service.py
similarity index 100%
rename from model-providers/tests/openai_providers_test/test_ollama_service.py
rename to model-providers/tests/integration_tests/openai_providers_test/test_ollama_service.py
diff --git a/model-providers/tests/zhipuai_providers_test/model_providers.yaml b/model-providers/tests/integration_tests/zhipuai_providers_test/model_providers.yaml
similarity index 100%
rename from model-providers/tests/zhipuai_providers_test/model_providers.yaml
rename to model-providers/tests/integration_tests/zhipuai_providers_test/model_providers.yaml
diff --git a/model-providers/tests/zhipuai_providers_test/test_zhipuai_service.py b/model-providers/tests/integration_tests/zhipuai_providers_test/test_zhipuai_service.py
similarity index 100%
rename from model-providers/tests/zhipuai_providers_test/test_zhipuai_service.py
rename to model-providers/tests/integration_tests/zhipuai_providers_test/test_zhipuai_service.py
diff --git a/model-providers/tests/unit_tests/model_providers.yaml b/model-providers/tests/unit_tests/openai/model_providers.yaml
similarity index 100%
rename from model-providers/tests/unit_tests/model_providers.yaml
rename to model-providers/tests/unit_tests/openai/model_providers.yaml
diff --git a/model-providers/tests/unit_tests/test_provider_manager_models.py b/model-providers/tests/unit_tests/openai/test_provider_manager_models.py
similarity index 100%
rename from model-providers/tests/unit_tests/test_provider_manager_models.py
rename to model-providers/tests/unit_tests/openai/test_provider_manager_models.py