diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php
index 74b178a9e92..20d7e7b9bec 100644
--- a/lib/Cake/Console/Command/Task/TestTask.php
+++ b/lib/Cake/Console/Command/Task/TestTask.php
@@ -459,11 +459,6 @@ public function generateConstructor($type, $fullClassName, $plugin) {
 		if ($type == 'behavior') {
 			$construct = "new $fullClassName();\n";
 		}
-		if ($type == 'controller') {
-			$className = substr($fullClassName, 0, -10);
-			$construct = "new $fullClassName();\n";
-			$post = "\$this->{$className}->constructClasses();\n";
-		}
 		if ($type == 'helper') {
 			$pre = "\$View = new View();\n";
 			$construct = "new {$fullClassName}(\$View);\n";
diff --git a/lib/Cake/Console/Templates/default/classes/test.ctp b/lib/Cake/Console/Templates/default/classes/test.ctp
index 5bf1fc502be..2eb2b6c5299 100644
--- a/lib/Cake/Console/Templates/default/classes/test.ctp
+++ b/lib/Cake/Console/Templates/default/classes/test.ctp
@@ -44,6 +44,7 @@ class <?php echo $fullClassName; ?>Test extends CakeTestCase {
 	);
 
 <?php endif; ?>
+<?php if (!empty($construction)): ?>
 /**
  * setUp method
  *
@@ -67,6 +68,7 @@ class <?php echo $fullClassName; ?>Test extends CakeTestCase {
 		parent::tearDown();
 	}
 
+<?php endif; ?>
 <?php foreach ($methods as $method): ?>
 /**
  * test<?php echo Inflector::camelize($method); ?> method