diff --git a/cake/tests/cases/libs/all_model.test.php b/cake/tests/cases/libs/all_model.test.php
new file mode 100644
index 00000000000..cbb1b03e265
--- /dev/null
+++ b/cake/tests/cases/libs/all_model.test.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * AllXmlTest file
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ * @since         CakePHP(tm) v 2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * AllModelTest class
+ *
+ * This test group will run model class tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class AllModelTest extends PHPUnit_Framework_TestSuite {
+
+/**
+ * suite method, defines tests for this suite.
+ *
+ * @return void
+ */
+	public static function suite() {
+		$suite = new PHPUnit_Framework_TestSuite('All Model related class tests');
+
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_behavior.test.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_read.test.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_write.test.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_validation.test.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_integration.test.php');
+		return $suite;
+	}
+}
\ No newline at end of file
diff --git a/cake/tests/groups/model.group.php b/cake/tests/groups/model.group.php
deleted file mode 100644
index d089c6d5bf0..00000000000
--- a/cake/tests/groups/model.group.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * ModelGroupTest file
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
- * Copyright 2005-2010, 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-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.groups
- * @since         CakePHP(tm) v 1.2.0.5517
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-
-/**
- * ModelGroupTest class
- *
- * This test group will run all model-layer and related tests, (behaviors, etc.) excluding
- * database driver-specific tests
- *
- * @package       cake
- * @subpackage    cake.tests.groups
- */
-class ModelGroupTest extends TestSuite {
-
-/**
- * label property
- *
- * @var string
- * @access public
- */
-	public $label = 'All Model tests';
-
-/**
- * ModelGroupTest method
- *
- * @access public
- * @return void
- */
-	function ModelGroupTest() {
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_behavior');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_read');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_write');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_delete');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_integration');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_validation');
-	}
-}