diff --git a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
index ded7e9596e7..9d8c9e2b28d 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
@@ -222,7 +222,7 @@ public function testDoHelpersTrailingCommas() {
 	public function testDoComponentsNo() {
 		$this->Task->expects($this->any())->method('in')->will($this->returnValue('n'));
 		$result = $this->Task->doComponents();
-		$this->assertSame(array('Paginator'), $result);
+		$this->assertSame(array('Paginator', 'Flash'), $result);
 	}
 
 /**
@@ -235,7 +235,7 @@ public function testDoComponentsTrailingSpaces() {
 		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue(' RequestHandler, Security  '));
 
 		$result = $this->Task->doComponents();
-		$expected = array('Paginator', 'RequestHandler', 'Security');
+		$expected = array('Paginator', 'Flash', 'RequestHandler', 'Security');
 		$this->assertEquals($expected, $result);
 	}
 
@@ -249,7 +249,7 @@ public function testDoComponentsTrailingCommas() {
 		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue(' RequestHandler, Security, , '));
 
 		$result = $this->Task->doComponents();
-		$expected = array('Paginator', 'RequestHandler', 'Security');
+		$expected = array('Paginator', 'Flash', 'RequestHandler', 'Security');
 		$this->assertEquals($expected, $result);
 	}
 
diff --git a/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp b/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp
index 5cd6a4dee52..b4072d770e9 100644
--- a/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp
+++ b/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp
@@ -33,10 +33,10 @@
 		if ($this->request->is('post')) {
 			$this->BakeArticle->create();
 			if ($this->BakeArticle->save($this->request->data)) {
-				$this->Session->setFlash(__('The bake article has been saved.'));
+				$this->Flash->success(__('The bake article has been saved.'));
 				return $this->redirect(array('action' => 'index'));
 			} else {
-				$this->Session->setFlash(__('The bake article could not be saved. Please, try again.'));
+				$this->Flash->error(__('The bake article could not be saved. Please, try again.'));
 			}
 		}
 		$bakeTags = $this->BakeArticle->BakeTag->find('list');
@@ -56,10 +56,10 @@
 		}
 		if ($this->request->is(array('post', 'put'))) {
 			if ($this->BakeArticle->save($this->request->data)) {
-				$this->Session->setFlash(__('The bake article has been saved.'));
+				$this->Flash->success(__('The bake article has been saved.'));
 				return $this->redirect(array('action' => 'index'));
 			} else {
-				$this->Session->setFlash(__('The bake article could not be saved. Please, try again.'));
+				$this->Flash->error(__('The bake article could not be saved. Please, try again.'));
 			}
 		} else {
 			$options = array('conditions' => array('BakeArticle.' . $this->BakeArticle->primaryKey => $id));
@@ -83,9 +83,9 @@
 		}
 		$this->request->allowMethod('post', 'delete');
 		if ($this->BakeArticle->delete()) {
-			$this->Session->setFlash(__('The bake article has been deleted.'));
+			$this->Flash->success(__('The bake article has been deleted.'));
 		} else {
-			$this->Session->setFlash(__('The bake article could not be deleted. Please, try again.'));
+			$this->Flash->error(__('The bake article could not be deleted. Please, try again.'));
 		}
 		return $this->redirect(array('action' => 'index'));
 	}