diff --git a/app/webroot/test.php b/app/webroot/test.php
index 2f6a55e7a..fdf97f457 100644
--- a/app/webroot/test.php
+++ b/app/webroot/test.php
@@ -72,12 +72,7 @@ if (!include(CORE_PATH . 'Cake' . DS . 'bootstrap.php')) {
 	trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
 }
 
-$corePath = App::core('cake');
-if (isset($corePath[0])) {
-	define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
-} else {
-	define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
-}
+define('TEST_CAKE_CORE_INCLUDE_PATH', LIBS);
 
 if (Configure::read('debug') < 1) {
 	die(__('Debug setting does not allow access to this url.', true));
diff --git a/lib/Cake/Console/Command/TestSuiteShell.php b/lib/Cake/Console/Command/TestSuiteShell.php
index 3b3b1f901..9705d05de 100644
--- a/lib/Cake/Console/Command/TestSuiteShell.php
+++ b/lib/Cake/Console/Command/TestSuiteShell.php
@@ -160,13 +160,7 @@ class TestSuiteShell extends Shell {
  * @return void
  */
 	public function initialize() {
-		$corePath = App::core('cake');
-		if (isset($corePath[0])) {
-			define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
-		} else {
-			define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
-		}
-
+		define('TEST_CAKE_CORE_INCLUDE_PATH', LIBS);
 		$this->_dispatcher = new CakeTestSuiteDispatcher();
 		$this->_dispatcher->loadTestFramework();
 	}
diff --git a/lib/Cake/tests/cases/libs/folder.test.php b/lib/Cake/tests/cases/libs/folder.test.php
index f70b60e84..65ca682ab 100644
--- a/lib/Cake/tests/cases/libs/folder.test.php
+++ b/lib/Cake/tests/cases/libs/folder.test.php
@@ -17,6 +17,7 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+App::uses('Folder', 'Utility');
 App::uses('File', 'Utility');
 
 /**