diff --git a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
index 693637fb416..88ad25082f1 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
@@ -126,7 +126,7 @@ public function testGetThemePath() {
 	public function testGenerate() {
 		App::build(array(
 			'Console' => array(
-				LIBS . 'tests' . DS .  'test_app' . DS . 'console' . DS
+				LIBS . 'Test' . DS .  'test_app' . DS . 'console' . DS
 			)
 		));
 		$this->Task->initialize();
@@ -146,7 +146,7 @@ public function testGenerate() {
 	public function testGenerateWithTemplateFallbacks() {
 		App::build(array(
 			'Console' => array(
-				LIBS . 'tests' . DS .  'test_app' . DS . 'console' . DS,
+				LIBS . 'Test' . DS .  'test_app' . DS . 'console' . DS,
 				CAKE_CORE_INCLUDE_PATH . DS . 'console' . DS
 			)
 		));
diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
index 72743e3a938..f20514fad09 100644
--- a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
+++ b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
@@ -36,8 +36,8 @@
 class CakeTestCaseTest extends CakeTestCase {
 
 	public static function setUpBeforeClass() {
-		require_once LIBS . 'tests' . DS . 'Fixture' . DS . 'AssertTagsTestCase.php';
-		require_once LIBS . 'tests' . DS . 'Fixture' . DS . 'FixturizedTestCase.php';
+		require_once LIBS . 'Test' . DS . 'Fixture' . DS . 'AssertTagsTestCase.php';
+		require_once LIBS . 'Test' . DS . 'Fixture' . DS . 'FixturizedTestCase.php';
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php
index ccc71f07ed7..fbdcfa17067 100644
--- a/lib/Cake/Test/Case/Utility/XmlTest.php
+++ b/lib/Cake/Test/Case/Utility/XmlTest.php
@@ -133,7 +133,7 @@ public function testBuild() {
 		$this->assertEqual($obj->firstChild->nodeName, 'tag');
 		$this->assertEqual($obj->firstChild->nodeValue, 'value');
 
-		$xml = LIBS . 'tests' . DS . 'Fixture' . DS . 'sample.xml';
+		$xml = LIBS . 'Test' . DS . 'Fixture' . DS . 'sample.xml';
 		$obj = Xml::build($xml);
 		$this->assertEqual($obj->getName(), 'tags');
 		$this->assertEqual(count($obj), 2);
@@ -374,7 +374,7 @@ public function testToArray() {
 		$obj = Xml::build($xml);
 		$this->assertEqual(Xml::toArray($obj), array('tag' => 'name'));
 
-		$xml = LIBS . 'tests' . DS . 'Fixture' . DS . 'sample.xml';
+		$xml = LIBS . 'Test' . DS . 'Fixture' . DS . 'sample.xml';
 		$obj = Xml::build($xml);
 		$expected = array(
 			'tags' => array(
@@ -516,7 +516,7 @@ public function testToArray() {
  * @return void
  */
 	public function testRss() {
-		$rss = file_get_contents(LIBS . 'tests' . DS . 'Fixture' . DS . 'rss.xml');
+		$rss = file_get_contents(LIBS . 'Test' . DS . 'Fixture' . DS . 'rss.xml');
 		$rssAsArray = Xml::toArray(Xml::build($rss));
 		$this->assertEqual($rssAsArray['rss']['@version'], '2.0');
 		$this->assertEqual(count($rssAsArray['rss']['channel']['item']), 2);
@@ -647,7 +647,7 @@ public function testXmlRpc() {
  * @return void
  */
 	public function testSoap() {
-		$xmlRequest = Xml::build(LIBS . 'tests' . DS . 'Fixture' . DS . 'soap_request.xml');
+		$xmlRequest = Xml::build(LIBS . 'Test' . DS . 'Fixture' . DS . 'soap_request.xml');
 		$expected = array(
 			'Envelope' => array(
 				'@soap:encodingStyle' => 'http://www.w3.org/2001/12/soap-encoding',
@@ -660,7 +660,7 @@ public function testSoap() {
 		);
 		$this->assertEqual(Xml::toArray($xmlRequest), $expected);
 
-		$xmlResponse = Xml::build(LIBS . 'tests' . DS . 'Fixture' . DS . 'soap_response.xml');
+		$xmlResponse = Xml::build(LIBS . 'Test' . DS . 'Fixture' . DS . 'soap_response.xml');
 		$expected = array(
 			'Envelope' => array(
 				'@soap:encodingStyle' => 'http://www.w3.org/2001/12/soap-encoding',
diff --git a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
index 51c0392d92e..246251aedac 100644
--- a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
+++ b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
@@ -105,7 +105,7 @@ protected function _loadFixtures($fixtures) {
 
 			if (strpos($fixture, 'core.') === 0) {
 				$fixture = substr($fixture, strlen('core.'));
-				$fixturePaths[] = LIBS . 'tests' . DS . 'Fixture';
+				$fixturePaths[] = LIBS . 'Test' . DS . 'Fixture';
 			} elseif (strpos($fixture, 'app.') === 0) {
 				$fixture = substr($fixture, strlen('app.'));
 				$fixturePaths = array(