diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php
index 1b671204d60..7ba5f7596f5 100644
--- a/cake/tests/lib/cake_test_suite_dispatcher.php
+++ b/cake/tests/lib/cake_test_suite_dispatcher.php
@@ -230,9 +230,6 @@ function _runGroupTest() {
 				CodeCoverageManager::start($this->params['group'], $Reporter);
 			}
 			$this->Manager->runGroupTest(ucfirst($this->params['group']), $Reporter);
-			if ($this->params['codeCoverage']) {
-				CodeCoverageManager::report();
-			}
 		}
 	}
 
@@ -246,12 +243,7 @@ function _runTestCase() {
 		if ($this->params['codeCoverage']) {
 			CodeCoverageManager::start($this->params['case'], $Reporter);
 		}
-
 		$this->Manager->runTestCase($this->params['case'], $Reporter);
-
-		if ($this->params['codeCoverage']) {
-			CodeCoverageManager::report();
-		}
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/lib/code_coverage_manager.php b/cake/tests/lib/code_coverage_manager.php
index 019c632a264..81af4a040af 100644
--- a/cake/tests/lib/code_coverage_manager.php
+++ b/cake/tests/lib/code_coverage_manager.php
@@ -155,7 +155,7 @@ function report($output = true) {
 				case 'CakeHtmlReporter':
 					$result = $manager->reportCaseHtmlDiff(@file($testObjectFile), $coverageData, $execCodeLines, $manager->numDiffContextLines);
 					break;
-				case 'CLIReporter':
+				case 'CakeCliReporter':
 					$result = $manager->reportCaseCli(@file($testObjectFile), $coverageData, $execCodeLines, $manager->numDiffContextLines);
 					break;
 				default:
diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php
index c85f118ebf7..53162aa4bce 100644
--- a/cake/tests/lib/reporter/cake_html_reporter.php
+++ b/cake/tests/lib/reporter/cake_html_reporter.php
@@ -175,6 +175,13 @@ function paintFooter($test_name) {
 		}
 		echo $this->_paintLinks();
 		echo '</div>';
+		if (
+			isset($this->params['codeCoverage']) && 
+			$this->params['codeCoverage'] && 
+			class_exists('CodeCoverageManager')
+		) {
+			CodeCoverageManager::report();
+		}
 		$this->paintDocumentEnd();
 	}