diff --git a/tests/TestCase/Console/Command/BakeShellTest.php b/tests/TestCase/Console/Command/BakeShellTest.php
index cbda847db9e..511ff230584 100644
--- a/tests/TestCase/Console/Command/BakeShellTest.php
+++ b/tests/TestCase/Console/Command/BakeShellTest.php
@@ -106,9 +106,9 @@ public function testMain() {
 		$this->Shell->expects($this->at(0))
 			->method('out')
 			->with($this->stringContains('The following commands'));
-		$this->Shell->expects($this->at(4))
-			->method('out')
-			->with('behavior');
+
+		$this->Shell->expects($this->exactly(17))
+			->method('out');
 
 		$this->Shell->loadTasks();
 		$this->Shell->main();
@@ -149,6 +149,8 @@ public function testLoadTasksCoreAndApp() {
 			'View',
 			'Zerg',
 		];
+		sort($this->Shell->tasks);
+		sort($expected);
 		$this->assertEquals($expected, $this->Shell->tasks);
 	}