=== modified file 'modules/field/tests/field.test'
--- modules/field/tests/field.test	2010-02-11 15:42:14 +0000
+++ modules/field/tests/field.test	2010-02-11 16:09:36 +0000
@@ -16,10 +16,13 @@ class FieldTestCase extends DrupalWebTes
    * Set the default field storage backend for fields created during tests.
    */
   function setUp() {
-    // Call parent::setUp().
-    // @see http://www.php.net/manual/en/function.call-user-func-array.php#73105
     $args = func_get_args();
-    call_user_func_array(array($this, 'parent::setUp'), $args);
+    // Handle both a variable number of arguments and a single array of
+    // modules but pass on only one array.
+    if (count($args) == 1) {
+      $args = $args[0];
+    }
+    parent::setUp($args);
     // Set default storage backend.
     variable_set('field_storage_default', $this->default_storage);
   }
@@ -70,7 +73,16 @@ class FieldTestCase extends DrupalWebTes
 
 class FieldAttachTestCase extends FieldTestCase {
   function setUp() {
-    parent::setUp('field_test');
+    $args = func_get_args();
+    // Handle both a variable number of arguments and a single array of
+    // modules but pass on only one array.
+    if (count($args) == 1) {
+      $args = $args[0];
+    }
+    if (!in_array($args, 'field_test')) {
+      $args[] = 'field_test';
+    }
+    parent::setUp($args);
 
     $this->field_name = drupal_strtolower($this->randomName() . '_field_name');
     $this->field = array('field_name' => $this->field_name, 'type' => 'test_field', 'cardinality' => 4);

=== modified file 'modules/simpletest/drupal_web_test_case.php'
--- modules/simpletest/drupal_web_test_case.php	2010-02-09 12:28:39 +0000
+++ modules/simpletest/drupal_web_test_case.php	2010-02-11 16:06:15 +0000
@@ -1089,7 +1089,9 @@ class DrupalWebTestCase extends DrupalTe
    * is created with the same name as the database prefix.
    *
    * @param ...
-   *   List of modules to enable for the duration of the test.
+   *   Either a single array containing a list of modules to enabled or a 
+   *   variable number of arguments, where each argument is a module to be
+   *   enabled.
    */
   protected function setUp() {
     global $db_prefix, $user, $language, $conf;
@@ -1147,6 +1149,10 @@ class DrupalWebTestCase extends DrupalTe
     drupal_static_reset('_node_types_build');
 
     if ($modules = func_get_args()) {
+      // We accept an array of modules too.
+      if (is_array($modules[0])) {
+        $modules = $modules[0];
+      }
       // Install modules needed for this test.
       module_enable($modules, TRUE, TRUE);
     }