diff --git a/core/tests/test_registry.py b/core/tests/test_core_registry.py
similarity index 100%
rename from core/tests/test_registry.py
rename to core/tests/test_core_registry.py
diff --git a/modules/cosmosdb/tests/test_emulator.py b/modules/cosmosdb/tests/test_cosmosdb_emulator.py
similarity index 100%
rename from modules/cosmosdb/tests/test_emulator.py
rename to modules/cosmosdb/tests/test_cosmosdb_emulator.py
diff --git a/modules/cosmosdb/tests/test_mongodb.py b/modules/cosmosdb/tests/test_cosmosdb_mongodb.py
similarity index 100%
rename from modules/cosmosdb/tests/test_mongodb.py
rename to modules/cosmosdb/tests/test_cosmosdb_mongodb.py
diff --git a/modules/cosmosdb/tests/test_nosql.py b/modules/cosmosdb/tests/test_cosmosdb_nosql.py
similarity index 100%
rename from modules/cosmosdb/tests/test_nosql.py
rename to modules/cosmosdb/tests/test_cosmosdb_nosql.py