diff --git a/app/Console/cake.php b/app/Console/cake.php
index edef89473..3ac936ec1 100755
--- a/app/Console/cake.php
+++ b/app/Console/cake.php
@@ -18,7 +18,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 $ds = DIRECTORY_SEPARATOR;
-$dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
+$dispatcher = dirname(dirname(__DIR__)) . $ds . 'Lib' . $ds . 'cakephp' . $ds . 'lib' . $ds . 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
diff --git a/app/webroot/test.php b/app/webroot/test.php
index 39bea7a91..c469fe41f 100644
--- a/app/webroot/test.php
+++ b/app/webroot/test.php
@@ -69,7 +69,7 @@ if (!defined('WWW_ROOT')) {
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
-		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
+		ini_set('include_path', ROOT . DS . 'Lib' . DS . 'cakephp' . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 	}
 	if (!include ('Cake' . DS . 'bootstrap.php')) {
 		$failed = true;