2 files changed, 19 insertions, 7 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index b5babec21..739aaa74f 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -622,6 +622,13 @@ class DrupalUnitTestCase extends DrupalTestCase {
  */
 class DrupalWebTestCase extends DrupalTestCase {
   /**
+   * The profile to install as a basis for testing.
+   *
+   * @var string
+   */
+  protected $profile = 'standard';
+
+  /**
    * The URL currently loaded in the internal browser.
    *
    * @var string
@@ -1193,11 +1200,11 @@ class DrupalWebTestCase extends DrupalTestCase {
     variable_set('file_private_path', $private_files_directory);
     variable_set('file_temporary_path', $temp_files_directory);
 
-    // Include the default profile.
-    variable_set('install_profile', 'standard');
-    $profile_details = install_profile_info('standard', 'en');
+    // Include the testing profile.
+    variable_set('install_profile', $this->profile);
+    $profile_details = install_profile_info($this->profile, 'en');
 
-    // Install the modules specified by the default profile.
+    // Install the modules specified by the testing profile.
     module_enable($profile_details['dependencies'], FALSE);
 
     // Install modules needed for this test. This could have been passed in as
@@ -1212,8 +1219,13 @@ class DrupalWebTestCase extends DrupalTestCase {
       module_enable($modules, TRUE);
     }
 
-    // Run default profile tasks.
-    module_enable(array('standard'), FALSE);
+    // Run the profile tasks.
+    $install_profile_module_exists = db_query("SELECT 1 FROM {system} WHERE type = 'module' AND name = :name", array(
+      ':name' => $this->profile))
+      ->fetchField();
+    if ($install_profile_module_exists) {
+      module_enable(array($this->profile), FALSE);
+    }
 
     // Rebuild caches.
     drupal_static_reset();
@@ -3064,7 +3076,6 @@ class DrupalWebTestCase extends DrupalTestCase {
       $this->error(l(t('Verbose message'), $url, array('attributes' => array('target' => '_blank'))), 'User notice');
     }
   }
-
 }
 
 /**
diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test
index e7f812893..89b28537a 100644
--- a/modules/simpletest/tests/database_test.test
+++ b/modules/simpletest/tests/database_test.test
@@ -17,6 +17,7 @@ class FakeRecord { }
  * here.
  */
 class DatabaseTestCase extends DrupalWebTestCase {
+  protected $profile = 'testing';
 
   function setUp() {
     parent::setUp('database_test');