diff --git a/lib/Cake/tests/Case/Controller/ControllerTest.php b/lib/Cake/tests/Case/Controller/ControllerTest.php
index 9af38e2cb71..160f4b87bda 100644
--- a/lib/Cake/tests/Case/Controller/ControllerTest.php
+++ b/lib/Cake/tests/Case/Controller/ControllerTest.php
@@ -406,6 +406,7 @@ function setUp() {
  * @return void
  */
 	function teardown() {
+		CakePlugin::unload();
 		App::build();
 	}
 
@@ -442,6 +443,7 @@ function testLoadModelInPlugins() {
 			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
 			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
 		));
+		CakePlugin::load('TestPlugin');
 		App::uses('TestPluginAppController', 'TestPlugin.Controller');
 		App::uses('TestPluginController', 'TestPlugin.Controller');
 
@@ -481,6 +483,7 @@ function testConstructClasses() {
 		unset($Controller);
 
 		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		CakePlugin::load('TestPlugin');
 
 		$Controller = new Controller($request);
 		$Controller->uses = array('TestPlugin.TestPluginPost');