diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php
index e82e28f65..7e6744d13 100644
--- a/lib/Cake/Console/Command/Task/TestTask.php
+++ b/lib/Cake/Console/Command/Task/TestTask.php
@@ -191,13 +191,12 @@ class TestTask extends BakeTask {
 	public function getClassName($objectType) {
 		$type = strtolower($objectType);
 		if ($this->plugin) {
-			$path = Inflector::pluralize($type);
 			if ($type === 'helper') {
-				$path = 'View/Helper';
+				$type = 'View/Helper';
 			} elseif ($type === 'component') {
-				$path = 'Controller/Component';
+				$type = 'Controller/Component';
 			} elseif ($type === 'behavior') {
-				$path = 'Model/Behavior';
+				$type = 'Model/Behavior';
 			}
 			$plugin = $this->plugin . '.';
 			$options = App::objects($plugin . $type);
@@ -436,7 +435,7 @@ class TestTask extends BakeTask {
 		if (!$this->interactive) {
 			$className = $this->getRealClassName($type, $className);
 		}
-		return $path . Inflector::camelize($className) . 'Test.php';
+		return str_replace('/', DS, $path) . Inflector::camelize($className) . 'Test.php';
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
index 12c217afe..6f08c8042 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
@@ -572,7 +572,7 @@ class TestTaskTest extends CakeTestCase {
  * @return void
  */
 	public function testTestCaseFileName() {
-		$this->Task->path = '/my/path/tests/';
+		$this->Task->path = DS . 'my' . DS . 'path' . DS . 'tests' . DS;
 
 		$result = $this->Task->testCaseFileName('Model', 'Post');
 		$expected = $this->Task->path . 'Case' . DS . 'Model' . DS . 'PostTest.php';