Index: simpletest.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/simpletest.module,v
retrieving revision 1.33.2.4.2.19
diff -u -p -r1.33.2.4.2.19 simpletest.module
--- simpletest.module	14 Sep 2009 19:53:11 -0000	1.33.2.4.2.19
+++ simpletest.module	14 Sep 2009 20:21:15 -0000
@@ -407,7 +407,8 @@ function simpletest_test_get_all_classes
   $files = module_rebuild_cache();
   foreach ($files as $file) {
     $directory = dirname($file->filename);
-    $test_files = file_scan_directory($directory, '\.test$');
+    $test_files = file_scan_directory($directory, '\.test$', array('.', '..', 'CVS'), FALSE, FALSE);
+    $test_files += file_scan_directory($directory . '/tests', '\.test$');
 
     foreach ($test_files as $test_file) {
       $pre = get_declared_classes();