diff --git a/src/TestSuite/Fixture/FixtureManager.php b/src/TestSuite/Fixture/FixtureManager.php
index e16310a6b75..83437084f32 100644
--- a/src/TestSuite/Fixture/FixtureManager.php
+++ b/src/TestSuite/Fixture/FixtureManager.php
@@ -287,7 +287,7 @@ public function loadSingle($name, $db = null, $dropTables = true) {
 			}
 
 			if (!in_array($db->configName(), (array)$fixture->created)) {
-				$this->_setupTable($fixture, $db, $test->dropTables);
+				$this->_setupTable($fixture, $db, $dropTables);
 			}
 			$fixture->truncate($db);
 			$fixture->insert($db);
diff --git a/tests/TestCase/Console/Command/Task/ModelTaskTest.php b/tests/TestCase/Console/Command/Task/ModelTaskTest.php
index 9c9c44bdae0..4964992510b 100644
--- a/tests/TestCase/Console/Command/Task/ModelTaskTest.php
+++ b/tests/TestCase/Console/Command/Task/ModelTaskTest.php
@@ -97,6 +97,7 @@ protected function _setupOtherMocks() {
 	public function tearDown() {
 		parent::tearDown();
 		unset($this->Task);
+		$this->fixtureManager->shutDown();
 	}
 
 /**