diff --git a/cake/console/shells/command_list.php b/cake/console/shells/command_list.php
index 6ae688cc20a..9bc14f120e6 100644
--- a/cake/console/shells/command_list.php
+++ b/cake/console/shells/command_list.php
@@ -44,9 +44,9 @@ public function startup() {
 	public function main() {
 		if (empty($this->params['xml'])) {
 			$this->out("<info>Current Paths:</info>", 2);
-			$this->out(" -app: ". $this->Dispatch->params['app']);
-			$this->out(" -working: " . rtrim($this->Dispatch->params['working'], DS));
-			$this->out(" -root: " . rtrim($this->Dispatch->params['root'], DS));
+			$this->out(" -app: ". APP_DIR);
+			$this->out(" -working: " . rtrim(APP_PATH, DS));
+			$this->out(" -root: " . rtrim(ROOT, DS));
 			$this->out(" -core: " . rtrim(CORE_PATH, DS));
 			$this->out("");
 			$this->out("<info>Changing Paths:</info>", 2);
diff --git a/cake/tests/cases/console/shells/api.test.php b/cake/tests/cases/console/shells/api.test.php
index 6a4c5cb9645..109cf57f7c6 100644
--- a/cake/tests/cases/console/shells/api.test.php
+++ b/cake/tests/cases/console/shells/api.test.php
@@ -41,14 +41,10 @@ public function setUp() {
 		$out = $this->getMock('ConsoleOutput', array(), array(), '', false);
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
 
-		$this->Dispatcher = $this->getMock(
-			'ShellDispatcher', 
-			array('_stop', '_initEnvironment', 'dispatch')
-		);
 		$this->Shell = $this->getMock(
 			'ApiShell',
 			array('in', 'out', 'createFile', 'hr', '_stop'),
-			array(&$this->Dispatcher, $out, $out, $in)
+			array(	$out, $out, $in)
 		);
 	}
 
diff --git a/cake/tests/cases/console/shells/bake.test.php b/cake/tests/cases/console/shells/bake.test.php
index c5a04e887a6..8873aa12018 100644
--- a/cake/tests/cases/console/shells/bake.test.php
+++ b/cake/tests/cases/console/shells/bake.test.php
@@ -53,14 +53,10 @@ public function setUp() {
 		$out = $this->getMock('ConsoleOutput', array(), array(), '', false);
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
 
-		$this->Dispatcher = $this->getMock(
-			'ShellDispatcher', 
-			array('_stop', '_initEnvironment')
-		);
 		$this->Shell = $this->getMock(
 			'BakeShell',
 			array('in', 'out', 'hr', 'err', 'createFile', '_stop', '_checkUnitTest'),
-			array(&$this->Dispatcher, $out, $out, $in)
+			array($out, $out, $in)
 		);
 	}
 
diff --git a/cake/tests/cases/console/shells/command_list.test.php b/cake/tests/cases/console/shells/command_list.test.php
index 303b4257057..03979fccbc7 100644
--- a/cake/tests/cases/console/shells/command_list.test.php
+++ b/cake/tests/cases/console/shells/command_list.test.php
@@ -50,17 +50,13 @@ public function setUp() {
 		), true);
 		App::objects('plugin', null, false);
 
-		$this->Dispatcher = $this->getMock(
-			'ShellDispatcher', 
-			array('_stop', '_initEnvironment', 'dispatch')
-		);
 		$out = new TestStringOutput();
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
 
 		$this->Shell = $this->getMock(
 			'CommandListShell',
 			array('in', '_stop', 'clear'),
-			array(&$this->Dispatcher, $out, $out, $in)
+			array($out, $out, $in)
 		);
 	}
 
@@ -71,7 +67,7 @@ public function setUp() {
  */
 	function tearDown() {
 		parent::tearDown();
-		unset($this->Dispatcher, $this->Shell);
+		unset($this->Shell);
 	}
 
 /**
@@ -82,7 +78,7 @@ function tearDown() {
 	function testMain() {
 		$this->Shell->main();
 		$output = $this->Shell->stdout->output;
-;
+
 		$expected = "/example \[.*TestPlugin, TestPluginTwo.*\]/";
 		$this->assertPattern($expected, $output);
 
diff --git a/cake/tests/cases/console/shells/schema.test.php b/cake/tests/cases/console/shells/schema.test.php
index 544865c41bd..5fd76e63db6 100644
--- a/cake/tests/cases/console/shells/schema.test.php
+++ b/cake/tests/cases/console/shells/schema.test.php
@@ -114,11 +114,10 @@ public function setUp() {
 
 		$out = $this->getMock('ConsoleOutput', array(), array(), '', false);
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
-		$this->Dispatcher = $this->getMock('ShellDispatcher', array('_stop', '_initEnvironment'));
 		$this->Shell = $this->getMock(
 			'SchemaShell',
 			array('in', 'out', 'hr', 'createFile', 'error', 'err', '_stop'),
-			array(&$this->Dispatcher, $out, $out, $in)
+			array($out, $out, $in)
 		);
 	}
 
@@ -476,7 +475,7 @@ public function testPluginDotSyntaxWithCreate() {
 
 		$db =& ConnectionManager::getDataSource('test');
 		$sources = $db->listSources();
-		$this->assertTrue(in_array($db->config['prefix'] . 'acos', $sources));
+		$this->assertTrue(in_array($db->config['prefix'] . 'test_plugin_acos', $sources));
 
 		$schema = new TestPluginAppSchema();
 		$db->execute($db->dropSchema($schema, 'test_plugin_acos'));
diff --git a/cake/tests/cases/console/shells/testsuite.test.php b/cake/tests/cases/console/shells/testsuite.test.php
index 5ed119215b5..b132aa5571a 100644
--- a/cake/tests/cases/console/shells/testsuite.test.php
+++ b/cake/tests/cases/console/shells/testsuite.test.php
@@ -33,14 +33,13 @@ class TestSuiteShellTest extends CakeTestCase {
  * @return void
  */
 	public function setUp() {
-		$this->Dispatcher = $this->getMock(
-			'ShellDispatcher', 
-			array('_stop', '_initEnvironment')
-		);
+		$out = $this->getMock('ConsoleOutput', array(), array(), '', false);
+		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
+
 		$this->Shell = $this->getMock(
 			'TestSuiteShell',
 			array('in', 'out', 'hr', 'help', 'error', 'err', '_stop', 'initialize', 'run', 'clear'),
-			array(&$this->Dispatcher)
+			array($out, $out, $in)
 		);
 	}