diff --git a/app/webroot/test.php b/app/webroot/test.php
index d9d2f8d64..a2e534a09 100644
--- a/app/webroot/test.php
+++ b/app/webroot/test.php
@@ -189,7 +189,10 @@ if(isset($_GET['output']) && $_GET['output'] == 'html') {
 			break;
 		}
 	}
-
+	
+	CakePHPTestHeader();
+	CakePHPTestSuiteHeader();
+	
 	if (isset($_GET['group'])) {
 		if ('all' == $_GET['group']) {
 			TestManager::runAllTests(CakeTestsGetReporter());
@@ -212,9 +215,6 @@ if(isset($_GET['output']) && $_GET['output'] == 'html') {
 		exit();
 	}
 
-	CakePHPTestHeader();
-	CakePHPTestSuiteHeader();
-
 	if (isset($_GET['show']) && $_GET['show'] == 'cases') {
 		CakePHPTestCaseList();
 	} else {
diff --git a/cake/tests/lib/cake_reporter.php b/cake/tests/lib/cake_reporter.php
index acd132241..7a0b59d5e 100644
--- a/cake/tests/lib/cake_reporter.php
+++ b/cake/tests/lib/cake_reporter.php
@@ -51,19 +51,6 @@ class CakeHtmlReporter extends HtmlReporter {
 	function paintHeader($testName) {
 		$this->sendNoCacheHeaders();
 		$baseUrl = BASE_URL;
-		print "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
-		print "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
-		print "<head>\n";
-		print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" . $this->_character_set . "\" />\n";
-		print "<title>CakePHP(tm) Test Suite v 1.2.0.0 :: $testName</title>\n";
-		print "<link rel=\"stylesheet\" type=\"text/css\" href=\"$baseUrl/css/cake.generic.css\" />\n";
-		print "<style type=\"text/css\">\n";
-		print $this->_getCss() . "\n";
-		print "</style>\n";
-		print "</head>\n<body>\n";
-		print "<div id=\"wrapper\">\n";
-		print "<div id=\"content\">\n";
-		print "<h1>CakePHP(tm) Test Suite v 1.2.0.0</h1>\n";
 		print "<h2>$testName</h2>\n";
 		flush();
 	}
diff --git a/cake/tests/lib/content.php b/cake/tests/lib/content.php
index 8e86a6319..b53378e67 100644
--- a/cake/tests/lib/content.php
+++ b/cake/tests/lib/content.php
@@ -27,9 +27,8 @@
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 ?>
-<div id="wrapper">
 	<div id="content">
-		<h1>CakePHP(tm) Test Suite v 1.2.0.0</h1>
+		<h1>CakePHP Test Suite v 1.2.0.0</h1>
 			<ul>
 				<li><a href='<?php echo $groups;?>'>Core Test Groups</a></li>
 				<li><a href='<?php echo $cases;?>'>Core Test Cases</a></li>
@@ -37,4 +36,6 @@
 			<ul>
 				<li><a href='<?php echo $groups;?>&amp;app=true'>App Test Groups</a></li>
 				<li><a href='<?php echo $cases;?>&amp;app=true'>App Test Cases</a></li>
-			</ul>
\ No newline at end of file
+			</ul>
+	
+	
\ No newline at end of file
diff --git a/cake/tests/lib/footer.php b/cake/tests/lib/footer.php
index 977c595ab..2645c4165 100644
--- a/cake/tests/lib/footer.php
+++ b/cake/tests/lib/footer.php
@@ -27,16 +27,12 @@
  * @license			http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
 ?>
- 		</div>
+		</div>
  		<div id="footer">
- 			<p>
- 				<a href="https://trac.cakephp.org/wiki/Developement/TestSuite">CakePHP(tm) Test Suite </a> ::
- 				<a href="http://www.cakefoundation.org/"> &copy; 2005-2007, Cake Software Foundation, Inc.</a></p>
- 			<p>
  			<!--PLEASE USE ONE OF THE POWERED BY CAKEPHP LOGO-->
  			<a href="http://www.cakephp.org/" target="_new">
  				<img src="<?php echo $baseUrl; ?>/img/cake.power.png" alt="CakePHP(tm) :: Rapid Development Framework" height = "15" width = "80" /></a></p>
  		</div>
- 		</div>
- 	</body>
- 	</html>
\ No newline at end of file
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/cake/tests/lib/header.php b/cake/tests/lib/header.php
index 2fa8e9b68..7e4c859d5 100644
--- a/cake/tests/lib/header.php
+++ b/cake/tests/lib/header.php
@@ -31,7 +31,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv='content-Type' content='text/html; charset=iso-8859-1' />
-		<title>CakePHP(tm) Test Suite v 1.2.0.0</title>
+		<title>CakePHP Test Suite v 1.2.0.0</title>
 		<link rel="stylesheet" type="text/css" href="<?php echo $baseUrl; ?>/css/cake.generic.css" />
+		<style>
+			h3 {font-size: 150%}
+			a {font-size: 120%}
+			li {line-height: 140%}
+		</style>
 	</head>
-	<body>
\ No newline at end of file
+	<body>
+		<div id="container">
+			<div id="header">
+				<h1>CakePHP: the PHP Rapid Development Framework</h1>
+			</div>
\ No newline at end of file
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index 98046cf95..259313fca 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -313,14 +313,14 @@ class HtmlTestManager extends TestManager {
 		$groupTests =& $manager->_getTestGroupList($directory);
 
 		if (1 > count($groupTests)) {
-			$noGroupTests = "<p>No test cases set up!</p>";
+			$noGroupTests = "<h3>No test cases set up!</h3>";
 			return $noGroupTests;
 		}
 
 		if (isset($_GET['app'])){
-			$buffer = "<p>Available App Test Groups:</p>\n<ul>";
+			$buffer = "<h3>Available App Test Groups:</h3>\n<ul>";
 		} else {
-			$buffer = "<p>Available Core Test Groups:</p>\n<ul>";
+			$buffer = "<h3>Available Core Test Groups:</h3>\n<ul>";
 		}
 		$buffer .= "<li><a href='" . $manager->getBaseURL() . "?group=all$userApp'>All tests</a></li>\n";
 
@@ -340,13 +340,13 @@ class HtmlTestManager extends TestManager {
 		$testCases =& $manager->_getTestCaseList($directory);
 
 		if (1 > count($testCases)) {
-			$noTestCases = "<p>No test cases set up!</p>";
+			$noTestCases = "<h3>No test cases set up!</h3>";
 			return $noTestCases;
 		}
 		if (isset($_GET['app'])) {
-			$buffer = "<p>Available App Test Cases:</p>\n<ul>";
+			$buffer = "<h3>Available App Test Cases:</h3>\n<ul>";
 		} else {
-			$buffer = "<p>Available Core Test Cases:</p>\n<ul>";
+			$buffer = "<h3>Available Core Test Cases:</h3>\n<ul>";
 		}
 		foreach ($testCases as $testCaseFile => $testCase) {
 			$buffer .= "<li><a href='" . $manager->getBaseURL() . "?case=" . urlencode($testCase) . $userApp ."'>" . $testCase . "</a></li>\n";
