diff --git a/cake/tests/lib/cake_test_menu.php b/cake/tests/lib/cake_test_menu.php
index c2f920de9..3e7e262f8 100644
--- a/cake/tests/lib/cake_test_menu.php
+++ b/cake/tests/lib/cake_test_menu.php
@@ -84,24 +84,6 @@ class CakeTestMenu {
 		}
 	}
 
-/**
- * Provides the left hand navigation for the testsuite
- *
- * @return void
- * @access public
- */
-	function testSuiteHeader() {
-		switch (CAKE_TEST_OUTPUT) {
-			case CAKE_TEST_OUTPUT_HTML:
-				ob_start();
-				$groups = $_SERVER['PHP_SELF'] . '?show=groups';
-				$cases = $_SERVER['PHP_SELF'] . '?show=cases';
-				$plugins = App::objects('plugin');
-				include CAKE_TESTS_LIB . 'content.php';
-				break;
-		}
-	}
-
 /**
  * Provides the testsuite footer text
  *
diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php
index 59365c818..26b5068ba 100644
--- a/cake/tests/lib/cake_test_suite_dispatcher.php
+++ b/cake/tests/lib/cake_test_suite_dispatcher.php
@@ -139,7 +139,7 @@ class CakeTestSuiteDispatcher {
 		$Reporter =& $this->getReporter();
 		$Reporter->paintDocumentHeader();
 		$Reporter->paintTestMenu();
-		CakeTestMenu::testCaseList();
+		$Reporter->testCaseList();
 		$Reporter->paintDocumentEnd();
 	}
 
@@ -152,7 +152,7 @@ class CakeTestSuiteDispatcher {
 		$Reporter =& $this->getReporter();
 		$Reporter->paintDocumentHeader();
 		$Reporter->paintTestMenu();
-		CakeTestMenu::groupTestList();
+		$Reporter->groupTestList();
 		$Reporter->paintDocumentEnd();
 	}
 
diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php
index 4bb8ea927..3a256333f 100644
--- a/cake/tests/lib/reporter/cake_html_reporter.php
+++ b/cake/tests/lib/reporter/cake_html_reporter.php
@@ -129,7 +129,28 @@ class CakeHtmlReporter extends SimpleReporter {
  * @return void
  */
 	function paintTestMenu() {
-		CakeTestMenu::testSuiteHeader();
+		$groups = $_SERVER['PHP_SELF'] . '?show=groups';
+		$cases = $_SERVER['PHP_SELF'] . '?show=cases';
+		$plugins = App::objects('plugin');
+		include CAKE_TESTS_LIB . 'templates' . DS . 'menu.php';
+	}
+
+/**
+ * Retrieves and paints the list of tests cases in an HTML format.
+ *
+ * @return void
+ */
+	function testCaseList() {
+		CakeTestMenu::testCaseList();
+	}
+
+/**
+ * Retrieves and paints the list of group tests in an HTML format.
+ *
+ * @return void
+ */
+	function groupTestList() {
+		CakeTestMenu::groupTestList();
 	}
 
 /**
diff --git a/cake/tests/lib/templates/content.php b/cake/tests/lib/templates/content.php
deleted file mode 100644
index 8fd087474..000000000
--- a/cake/tests/lib/templates/content.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Short description for file.
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.cake.tests.lib
- * @since         CakePHP(tm) v 1.2.0.4433
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-?>
-<div class="test-menu">
-<ul>
-	<li>
-		<span  style="font-size: 18px">App</span>
-		<ul>
-			<li><a href='<?php echo $groups;?>&amp;app=true'>Test Groups</a></li>
-			<li><a href='<?php echo $cases;?>&amp;app=true'>Test Cases</a></li>
-		</ul>
-	</li>
-<?php
-if (!empty($plugins)):
-?>
-	<li style="padding-top: 10px">
-		<span  style="font-size: 18px">Plugins</span>
-	<?php foreach($plugins as $plugin):
-			$pluginPath = Inflector::underscore($plugin);
-	?>
-			<ul>
-				<li style="padding-top: 10px">
-					<span  style="font-size: 18px"><?php echo $plugin;?></span>
-					<ul>
-						<li><a href='<?php echo $groups;?>&amp;plugin=<?php echo $pluginPath; ?>'>Test Groups</a></li>
-						<li><a href='<?php echo $cases;?>&amp;plugin=<?php echo $pluginPath; ?>'>Test Cases</a></li>
-					</ul>
-				</li>
-			</ul>
-	<?php endforeach; ?>
-<?php endif;?>
-	<li style="padding-top: 10px">
-		<span style="font-size: 18px">Core</span>
-		<ul>
-			<li><a href='<?php echo $groups;?>'>Test Groups</a></li>
-			<li><a href='<?php echo $cases;?>'>Test Cases</a></li>
-		</ul>
-	</li>
-</ul>
-</div>
-<div  class="test-results">
\ No newline at end of file
diff --git a/cake/tests/lib/content.php b/cake/tests/lib/templates/menu.php
similarity index 93%
rename from cake/tests/lib/content.php
rename to cake/tests/lib/templates/menu.php
index 8fd087474..2a5b86219 100644
--- a/cake/tests/lib/content.php
+++ b/cake/tests/lib/templates/menu.php
@@ -21,7 +21,7 @@
 <div class="test-menu">
 <ul>
 	<li>
-		<span  style="font-size: 18px">App</span>
+		<span style="font-size: 18px">App</span>
 		<ul>
 			<li><a href='<?php echo $groups;?>&amp;app=true'>Test Groups</a></li>
 			<li><a href='<?php echo $cases;?>&amp;app=true'>Test Cases</a></li>
@@ -31,7 +31,7 @@
 if (!empty($plugins)):
 ?>
 	<li style="padding-top: 10px">
-		<span  style="font-size: 18px">Plugins</span>
+		<span style="font-size: 18px">Plugins</span>
 	<?php foreach($plugins as $plugin):
 			$pluginPath = Inflector::underscore($plugin);
 	?>