diff --git a/cake/tests/lib/code_coverage_manager.php b/cake/tests/lib/code_coverage_manager.php
index 0aac099ce45..4b975ab5314 100644
--- a/cake/tests/lib/code_coverage_manager.php
+++ b/cake/tests/lib/code_coverage_manager.php
@@ -105,7 +105,6 @@ function init($testCaseFile, &$reporter) {
 		}
 		$manager->setParams($reporter);
 		$manager->testCaseFile = $testCaseFile;
-		CodeCoverageManager::start();
 	}
 
 /**
@@ -180,11 +179,8 @@ function report($output = true) {
 			$dump = xdebug_get_code_coverage();
 			$coverageData = array();
 
-			foreach ($dump as $file => $data) {
-				if ($file == $testObjectFile) {
-					$coverageData = $data;
-					break;
-				}
+			if (isset($dump[$testObjectFile])) {
+				$coverageData = $dump[$testObjectFile];
 			}
 
 			if (empty($coverageData) && $output) {
@@ -215,9 +211,10 @@ function report($output = true) {
 			}
 			$dump = xdebug_get_code_coverage();
 			$coverageData = array();
-			foreach ($dump as $file => $data) {
-				if (in_array($file, $testObjectFiles)) {
-					$coverageData[$file] = $data;
+			
+			foreach ($testObjectFiles as $file) {
+				if (isset($dump[$file])) {
+					$coverageData[$file] = $dump[$file];
 				}
 			}