diff --git a/cake/tests/cases/console/libs/bake.test.php b/cake/tests/cases/console/libs/bake.test.php
index 2dcb3c932..8ff25762a 100644
--- a/cake/tests/cases/console/libs/bake.test.php
+++ b/cake/tests/cases/console/libs/bake.test.php
@@ -42,7 +42,7 @@ if (!class_exists('UsersController')) {
 	}
 }
 
-class BakeShellTestCase extends CakeTestCase {
+class BakeShellTest extends CakeTestCase {
 
 /**
  * fixtures
diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php
index 9bb237e7a..2eed2cb17 100644
--- a/cake/tests/cases/libs/controller/components/acl.test.php
+++ b/cake/tests/cases/libs/controller/components/acl.test.php
@@ -265,7 +265,7 @@ class AclComponentTest extends CakeTestCase {
  *
  * @package cake.tests.cases.libs.controller.components
  */
-class IniAclTestCase extends CakeTestCase {
+class IniAclTest extends CakeTestCase {
 
 /**
  * testIniReadConfigFile
@@ -345,7 +345,7 @@ class IniAclTestCase extends CakeTestCase {
  *
  * @package cake.tests.cases.libs.controller.components
  */
-class DbAclTestCase extends CakeTestCase {
+class DbAclTest extends CakeTestCase {
 /**
  * fixtures property
  *
diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
index 7f6896f3e..3ee4717e9 100644
--- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -127,7 +127,7 @@ class MergePostsController extends MergeVarPluginAppController {
  *
  * @package cake.tests.cases.libs.controller
  */
-class ControllerMergeVarsTestCase extends CakeTestCase {
+class ControllerMergeVarsTest extends CakeTestCase {
 /**
  * Skips the case if APP_CONTROLLER_EXISTS is defined
  *
diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php
index b6cf2aa7d..35974a1d3 100644
--- a/cake/tests/cases/libs/model/behaviors/acl.test.php
+++ b/cake/tests/cases/libs/model/behaviors/acl.test.php
@@ -189,7 +189,7 @@ class AclPost extends CakeTestModel {
 * @package       cake
 * @subpackage    cake.tests.cases.libs.controller.components
 */
-class AclBehaviorTestCase extends CakeTestCase {
+class AclBehaviorTest extends CakeTestCase {
 
 /**
  * Aco property
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index b9598cc44..a90815b96 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -2010,7 +2010,7 @@ class RouterTest extends CakeTestCase {
  *
  * @package cake.tests.cases.libs.
  **/
-class CakeRouteTestCase extends CakeTestCase {
+class CakeRouteTest extends CakeTestCase {
 /**
  * startTest method
  *
@@ -2412,7 +2412,7 @@ class CakeRouteTestCase extends CakeTestCase {
  *
  * @package cake.tests.libs
  */
-class PluginShortRouteTestCase extends  CakeTestCase {
+class PluginShortRouteTest extends  CakeTestCase {
 /**
  * startTest method
  *
diff --git a/cake/tests/fixtures/assert_tags_test_case.php b/cake/tests/fixtures/assert_tags_test_case.php
index 7062ab8ca..d6e352e34 100644
--- a/cake/tests/fixtures/assert_tags_test_case.php
+++ b/cake/tests/fixtures/assert_tags_test_case.php
@@ -8,7 +8,7 @@ PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
  * @package       cake
  * @subpackage    cake.tests.fixtures
  */
-class AssertTagsTestCase extends CakeTestCase {
+class AssertTagsTest extends CakeTestCase {
 
 /**
  * test that assertTags knows how to handle correct quoting.
diff --git a/cake/tests/fixtures/fixturized_test_case.php b/cake/tests/fixtures/fixturized_test_case.php
index 1895b63af..1704cf4cf 100644
--- a/cake/tests/fixtures/fixturized_test_case.php
+++ b/cake/tests/fixtures/fixturized_test_case.php
@@ -8,7 +8,7 @@ PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'DEFAULT');
  * @package       cake
  * @subpackage    cake.tests.fixtures
  */
-class FixturizedTestCase extends CakeTestCase {
+class FixturizedTest extends CakeTestCase {
 
 /**
  * Fixtures to use in this thes