diff --git a/lib/Cake/tests/test_app/models/datasources/test/test_local_driver.php b/lib/Cake/tests/test_app/models/datasources/Database/TestLocalDriver.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/datasources/test/test_local_driver.php
rename to lib/Cake/tests/test_app/models/datasources/Database/TestLocalDriver.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php b/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/Database/DboDummy.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/Database/DboDummy.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php b/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/Database/TestDriver.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/Database/TestDriver.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php b/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/TestSource.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/TestSource.php