diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php
index a98388baf2a..5dfc79afcda 100644
--- a/cake/tests/cases/dispatcher.test.php
+++ b/cake/tests/cases/dispatcher.test.php
@@ -562,6 +562,7 @@ public function setUp() {
 		$this->_debug = Configure::read('debug');
 
 		App::build(App::core());
+		App::objects('plugin', null, false);
 	}
 
 /**
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index e246f944030..cefaeaff1b0 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -445,12 +445,21 @@ class ControllerTest extends CakeTestCase {
 	public $fixtures = array('core.post', 'core.comment', 'core.name');
 
 /**
- * endTest
+ * reset environment.
+ *
+ * @return void
+ */
+	function setUp() {
+		App::objects('plugin', null, false);
+	}
+
+/**
+ * teardown
  *
  * @access public
  * @return void
  */
-	function endTest() {
+	function teardown() {
 		App::build();
 	}
 
@@ -960,6 +969,7 @@ function testRender() {
 		$this->assertPattern('/this is the test element/', $result);
 
 		$Controller = new TestController($request);
+		$Controller->helpers = array('Html');
 		$Controller->constructClasses();
 		$Controller->ControllerComment->validationErrors = array('title' => 'tooShort');
 		$expected = $Controller->ControllerComment->validationErrors;
diff --git a/cake/tests/cases/libs/multibyte.test.php b/cake/tests/cases/libs/multibyte.test.php
index aeb6ca50a42..04b991ef291 100644
--- a/cake/tests/cases/libs/multibyte.test.php
+++ b/cake/tests/cases/libs/multibyte.test.php
@@ -4532,8 +4532,7 @@ function testUsingMbStrripos() {
 		$string = 'državni';
 		$find = 'dž';
 		$result = mb_strripos($string, $find);
-		$expected = 0;
-		$this->assertEqual($result, $expected);
+		$this->assertFalse($result);
 	}
 
 /**
diff --git a/cake/tests/test_app/views/layouts/default.ctp b/cake/tests/test_app/views/layouts/default.ctp
index df808691a86..f87f3d4c983 100644
--- a/cake/tests/test_app/views/layouts/default.ctp
+++ b/cake/tests/test_app/views/layouts/default.ctp
@@ -38,8 +38,6 @@
 		</div>
 		<div id="content">
 
-			<?php $this->Session->flash();?>
-
 			<?php echo $content_for_layout;?>
 
 		</div>