diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index eaa19895f..50e63d9b9 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -452,7 +452,7 @@ class ComponentTest extends CakeTestCase {
 		$this->assertTrue(is_a($Controller->ParamTest, 'ParamTestComponent'));
 		$this->assertTrue(is_a($Controller->ParamTest->Banana, 'BananaComponent'));
 		$this->assertTrue(is_a($Controller->Orange, 'OrangeComponent'));
-		$this->assertTrue(is_a($Controller->Session, 'SessionComponent'));
+		$this->assertFalse(isset($Controller->Session));
 		$this->assertEqual($Controller->Orange->settings, array('colour' => 'blood orange'));
 		$this->assertEqual($Controller->ParamTest->test, 'value');
 		$this->assertEqual($Controller->ParamTest->flag, true);
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 874fb1e13..9f819fd01 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -237,7 +237,7 @@ class AuthTestController extends Controller {
  * @var array
  * @access public
  */
-	var $components = array('Auth', 'Acl');
+	var $components = array('Session', 'Auth', 'Acl');
 
 /**
  * testUrl property
@@ -382,7 +382,7 @@ class AjaxAuthController extends Controller {
  * @var array
  * @access public
  */
-	var $components = array('TestAuth');
+	var $components = array('Session', 'TestAuth');
 
 /**
  * uses property
@@ -514,6 +514,7 @@ class AuthTest extends CakeTestCase {
 		$_ENV = $this->_env;
 		Configure::write('Acl', $this->_acl);
 		Configure::write('Security.salt', $this->_securitySalt);
+
 		$this->Controller->Session->delete('Auth');
 		$this->Controller->Session->delete('Message.auth');
 		ClassRegistry::flush();
@@ -1539,7 +1540,8 @@ class AuthTest extends CakeTestCase {
 				'loginAction' => array('controller' => 'people', 'action' => 'login'),
 				'userModel' => 'AuthUserCustomField',
 				'sessionKey' => 'AltAuth.AuthUserCustomField'
-			)
+			),
+			'Session'
 		);
 		$this->Controller->Component->init($this->Controller);
 		$this->Controller->Component->initialize($this->Controller);
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
index 073d120db..8c86600f4 100644
--- a/cake/tests/cases/libs/controller/components/email.test.php
+++ b/cake/tests/cases/libs/controller/components/email.test.php
@@ -150,7 +150,7 @@ class EmailTestController extends Controller {
  * @var array
  * @access public
  */
-	var $components = array('EmailTest');
+	var $components = array('Session', 'EmailTest');
 
 /**
  * pageTitle property
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index 6f5976d6f..cb83f947c 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -60,7 +60,7 @@ class SecurityTestController extends Controller {
  * @var array
  * @access public
  */
-	var $components = array('TestSecurity');
+	var $components = array('Session', 'TestSecurity');
 
 /**
  * failed property
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index d07930815..3b8bdfec8 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -1077,7 +1077,7 @@ class ControllerTest extends CakeTestCase {
 		$Controller->uses = array();
 		$Controller->constructClasses();
 
-		$this->assertTrue(isset($Controller->Session));
+		$this->assertFalse(isset($Controller->Session));
 	}
 
 /**