diff --git a/cake/tests/groups/lib.group.php b/cake/tests/groups/lib.group.php
index 07e6ab41b50..999ba7da233 100644
--- a/cake/tests/groups/lib.group.php
+++ b/cake/tests/groups/lib.group.php
@@ -39,7 +39,7 @@ class LibGroupTest extends GroupTest {
  * @var string 'All cake/libs/* (Not yet implemented)'
  * @access public
  */
-	var $label = 'All Libs';
+	var $label = 'All core, non MVC element libs';
 /**
  * LibGroupTest method
  *
@@ -47,7 +47,15 @@ class LibGroupTest extends GroupTest {
  * @return void
  */
 	function LibGroupTest() {
-		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_log');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'class_registry');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'inflector');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'overloadable');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'sanitize');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'security');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'set');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'string');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'validation');
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/groups/no_database.group.php b/cake/tests/groups/no_database.group.php
deleted file mode 100644
index f23f6be7fed..00000000000
--- a/cake/tests/groups/no_database.group.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * NoDatabaseGroupTest file
- *
- * Long description for file
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
- * @package       cake
- * @subpackage    cake.tests.groups
- * @since         CakePHP(tm) v 1.2.0.4206
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-/**
- * NoDatabaseGroupTest class
- *
- * This test group will run all test in the cases/libs directory.
- *
- * @package       cake
- * @subpackage    cake.tests.groups
- */
-class NoDatabaseGroupTest extends GroupTest {
-/**
- * label property
- *
- * @var string 'All tests without a database connection'
- * @access public
- */
-	var $label = 'All Libs not requiring a database connection';
-/**
- * NoDatabaseGroupTest method
- *
- * @access public
- * @return void
- */
-	function NoDatabaseGroupTest() {
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'dispatcher');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'router');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'inflector');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'validation');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'session');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'socket');
-		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view');
-	}
-}
-?>
\ No newline at end of file