Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.113
diff -u -p -r1.113 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php	4 Jun 2009 03:33:28 -0000	1.113
+++ modules/simpletest/drupal_web_test_case.php	4 Jun 2009 17:50:14 -0000
@@ -988,6 +988,9 @@ class DrupalWebTestCase extends DrupalTe
 
     $this->preloadRegistry();
 
+    // Reset the user admin role id, to prevent using the value of the current database.
+    variable_set('user_admin_role', 0);
+
     // Add the specified modules to the list of modules in the default profile.
     $args = func_get_args();
     $modules = array_unique(array_merge(drupal_get_profile_modules('default', 'en'), $args));
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.55
diff -u -p -r1.55 user.admin.inc
--- modules/user/user.admin.inc	4 Jun 2009 09:52:33 -0000	1.55
+++ modules/user/user.admin.inc	4 Jun 2009 17:50:15 -0000
@@ -934,7 +934,7 @@ function theme_user_filters($form) {
 /**
  * Implementation of hook_modules_installed().
  */
-function user_modules_installed($modules) {
+function user_modules_enabled($modules) {
   // Assign all available permissions to the administrator role.
   $rid = variable_get('user_admin_role', 0);
   if ($rid) {
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.46
diff -u -p -r1.46 system.test
--- modules/system/system.test	27 May 2009 18:34:01 -0000	1.46
+++ modules/system/system.test	4 Jun 2009 17:50:16 -0000
@@ -113,6 +113,7 @@ class EnableDisableTestCase extends Modu
     // Install (and enable) aggregator module.
     $edit = array();
     $edit['modules[Core][aggregator][enable]'] = 'aggregator';
+    $edit['modules[Core][forum][enable]'] = 'forum';
     $this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));