diff -u b/includes/update.inc b/includes/update.inc
--- b/includes/update.inc
+++ b/includes/update.inc
@@ -798,6 +798,7 @@
   // Default profile has been renamed to Standard in D7.
   if ($profile == 'default') {
     $profile = 'standard';
+    variable_set('install_profile', $profile);
   }
 
   $results = db_select('system', 's')
diff -u b/modules/simpletest/tests/bootstrap.test b/modules/simpletest/tests/bootstrap.test
--- b/modules/simpletest/tests/bootstrap.test
+++ b/modules/simpletest/tests/bootstrap.test
@@ -424,7 +424,7 @@
       // Skip error handling if this is a "file not found" error.
       if (strstr($message, 'is missing from the file system:')) {
         $get_filename_test_triggered_error = TRUE;
-        return TRUE;
+        return;
       }
       _drupal_error_handler($error_level, $message, $filename, $line, $context);
     });