diff -u b/modules/simpletest/tests/system_test.module b/modules/simpletest/tests/system_test.module
--- b/modules/simpletest/tests/system_test.module
+++ b/modules/simpletest/tests/system_test.module
@@ -77,7 +77,7 @@
     'access callback' => TRUE,
     'type' => MENU_CALLBACK,
   );
-  
+
   $items['system-test/drupal-set-message'] = array(
     'title' => 'Set messages with drupal_set_message()',
     'page callback' => 'system_test_drupal_set_message',
@@ -112,7 +112,7 @@
     'access callback' => TRUE,
     'type' => MENU_CALLBACK,
   );
-  
+
   return $items;
 }
 
@@ -428,12 +428,11 @@
   drupal_goto($authorize_url);
 }
 
-
 /**
  * Sets two messages and removes the first one before the messages are displayed.
  */
 function system_test_drupal_set_message() {
-  
+
   // Set two messages.
   drupal_set_message('First message (removed).');
   drupal_set_message('Second message (not removed).');
diff -u b/modules/system/system.test b/modules/system/system.test
--- b/modules/system/system.test
+++ b/modules/system/system.test
@@ -2829,14 +2829,7 @@
 /**
  * Tests drupal_set_message() and related functions.
  */
-class DrupalSetMessageTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system_test');
+class DrupalSetMessageTest extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
@@ -2846,6 +2839,13 @@
     );
   }
 
+  function setUp() {
+    parent::setUp('system_test');
+
+    $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules'));
+    $this->drupalLogin($this->admin_user);
+  }
+
   /**
    * Tests setting messages and removing one before it is displayed.
    */
@@ -2859,4 +2859 @@
-
 }
-
-