diff --git a/cake/tests/lib/cake_test_case.php b/lib/Cake/TestSuite/CakeTestCase.php
similarity index 100%
rename from cake/tests/lib/cake_test_case.php
rename to lib/Cake/TestSuite/CakeTestCase.php
diff --git a/cake/tests/lib/cake_test_suite.php b/lib/Cake/TestSuite/CakeTestSuite.php
similarity index 100%
rename from cake/tests/lib/cake_test_suite.php
rename to lib/Cake/TestSuite/CakeTestSuite.php
diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
similarity index 100%
rename from cake/tests/lib/cake_test_suite_dispatcher.php
rename to lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
diff --git a/cake/tests/lib/cake_web_test_case.php b/lib/Cake/TestSuite/CakeWebTestCase.php
similarity index 100%
rename from cake/tests/lib/cake_web_test_case.php
rename to lib/Cake/TestSuite/CakeWebTestCase.php
diff --git a/cake/tests/lib/coverage/base_coverage_report.php b/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php
similarity index 100%
rename from cake/tests/lib/coverage/base_coverage_report.php
rename to lib/Cake/TestSuite/Coverage/BaseCoverageReport.php
diff --git a/cake/tests/lib/coverage/html_coverage_report.php b/lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php
similarity index 100%
rename from cake/tests/lib/coverage/html_coverage_report.php
rename to lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php
diff --git a/cake/tests/lib/coverage/text_coverage_report.php b/lib/Cake/TestSuite/Coverage/TextCoverageReport.php
similarity index 100%
rename from cake/tests/lib/coverage/text_coverage_report.php
rename to lib/Cake/TestSuite/Coverage/TextCoverageReport.php
diff --git a/cake/tests/lib/cake_fixture_manager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
similarity index 100%
rename from cake/tests/lib/cake_fixture_manager.php
rename to lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
diff --git a/cake/tests/lib/cake_test_fixture.php b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php
similarity index 100%
rename from cake/tests/lib/cake_test_fixture.php
rename to lib/Cake/TestSuite/Fixture/CakeTestFixture.php
diff --git a/cake/tests/lib/cake_test_model.php b/lib/Cake/TestSuite/Fixture/CakeTestModel.php
similarity index 100%
rename from cake/tests/lib/cake_test_model.php
rename to lib/Cake/TestSuite/Fixture/CakeTestModel.php
diff --git a/cake/tests/lib/reporter/cake_base_reporter.php b/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
similarity index 100%
rename from cake/tests/lib/reporter/cake_base_reporter.php
rename to lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
similarity index 100%
rename from cake/tests/lib/reporter/cake_html_reporter.php
rename to lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
diff --git a/cake/tests/lib/reporter/cake_text_reporter.php b/lib/Cake/TestSuite/Reporter/CakeTextReporter.php
similarity index 100%
rename from cake/tests/lib/reporter/cake_text_reporter.php
rename to lib/Cake/TestSuite/Reporter/CakeTextReporter.php
diff --git a/cake/tests/lib/test_manager.php b/lib/Cake/TestSuite/TestManager.php
similarity index 100%
rename from cake/tests/lib/test_manager.php
rename to lib/Cake/TestSuite/TestManager.php
diff --git a/cake/tests/lib/test_runner.php b/lib/Cake/TestSuite/TestRunner.php
similarity index 100%
rename from cake/tests/lib/test_runner.php
rename to lib/Cake/TestSuite/TestRunner.php
diff --git a/cake/tests/lib/templates/footer.php b/lib/Cake/TestSuite/templates/footer.php
similarity index 100%
rename from cake/tests/lib/templates/footer.php
rename to lib/Cake/TestSuite/templates/footer.php
diff --git a/cake/tests/lib/templates/header.php b/lib/Cake/TestSuite/templates/header.php
similarity index 100%
rename from cake/tests/lib/templates/header.php
rename to lib/Cake/TestSuite/templates/header.php
diff --git a/cake/tests/lib/templates/menu.php b/lib/Cake/TestSuite/templates/menu.php
similarity index 100%
rename from cake/tests/lib/templates/menu.php
rename to lib/Cake/TestSuite/templates/menu.php
diff --git a/cake/tests/lib/templates/missing_conenction.php b/lib/Cake/TestSuite/templates/missing_conenction.php
similarity index 100%
rename from cake/tests/lib/templates/missing_conenction.php
rename to lib/Cake/TestSuite/templates/missing_conenction.php
diff --git a/cake/tests/lib/templates/phpunit.php b/lib/Cake/TestSuite/templates/phpunit.php
similarity index 100%
rename from cake/tests/lib/templates/phpunit.php
rename to lib/Cake/TestSuite/templates/phpunit.php
diff --git a/cake/tests/lib/templates/xdebug.php b/lib/Cake/TestSuite/templates/xdebug.php
similarity index 100%
rename from cake/tests/lib/templates/xdebug.php
rename to lib/Cake/TestSuite/templates/xdebug.php