diff --git modules/filter/filter.test modules/filter/filter.test
index b96c240..a612275 100644
--- modules/filter/filter.test
+++ modules/filter/filter.test
@@ -774,7 +774,7 @@ class FilterSecurityTestCase extends DrupalWebTestCase {
 /**
  * Unit tests for core filters.
  */
-class FilterUnitTestCase extends DrupalUnitTestCase {
+class FilterUnitTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Filter module filters',
diff --git modules/search/search.test modules/search/search.test
index fa5278c..ac74b0e 100644
--- modules/search/search.test
+++ modules/search/search.test
@@ -933,7 +933,7 @@ class SearchCommentTestCase extends DrupalWebTestCase {
  *
  * @see http://drupal.org/node/419388 (issue)
  */
-class SearchExpressionInsertExtractTestCase extends DrupalUnitTestCase {
+class SearchExpressionInsertExtractTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Search expression insert/extract',
@@ -1538,7 +1538,7 @@ class SearchConfigSettingsForm extends DrupalWebTestCase {
 /**
  * Tests the search_excerpt() function.
  */
-class SearchExcerptTestCase extends DrupalUnitTestCase {
+class SearchExcerptTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Search excerpt extraction',
diff --git modules/simpletest/simpletest.test modules/simpletest/simpletest.test
index 469d2c1..9f2e03c 100644
--- modules/simpletest/simpletest.test
+++ modules/simpletest/simpletest.test
@@ -480,7 +480,7 @@ class SimpleTestFolderTestCase extends DrupalWebTestCase {
 /**
  * Test required modules for tests.
  */
-class SimpleTestMissingDependentModuleUnitTest extends DrupalUnitTestCase {
+class SimpleTestMissingDependentModuleUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Testing dependent module test',
diff --git modules/simpletest/tests/batch.test modules/simpletest/tests/batch.test
index b7bfc9b..3743b06 100644
--- modules/simpletest/tests/batch.test
+++ modules/simpletest/tests/batch.test
@@ -317,7 +317,7 @@ class BatchPageTestCase extends DrupalWebTestCase {
  * Tests the function _batch_api_percentage() to make sure that the rounding
  * works properly in all cases.
  */
-class BatchPercentagesUnitTestCase extends DrupalUnitTestCase {
+class BatchPercentagesUnitTestCase extends DrupalWebTestCase {
   protected $testCases = array();
 
   public static function getInfo() {
diff --git modules/simpletest/tests/bootstrap.test modules/simpletest/tests/bootstrap.test
index 333f34b..10bc6c5 100644
--- modules/simpletest/tests/bootstrap.test
+++ modules/simpletest/tests/bootstrap.test
@@ -324,7 +324,7 @@ class HookBootExitTestCase extends DrupalWebTestCase {
 /**
  * Test drupal_get_filename()'s availability.
  */
-class BootstrapGetFilenameTestCase extends DrupalUnitTestCase {
+class BootstrapGetFilenameTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
@@ -356,7 +356,7 @@ class BootstrapGetFilenameTestCase extends DrupalUnitTestCase {
   }
 }
 
-class BootstrapTimerTestCase extends DrupalUnitTestCase {
+class BootstrapTimerTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
@@ -391,7 +391,7 @@ class BootstrapTimerTestCase extends DrupalUnitTestCase {
 /**
  * Test that resetting static variables works.
  */
-class BootstrapResettableStaticTestCase extends DrupalUnitTestCase {
+class BootstrapResettableStaticTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
@@ -430,7 +430,7 @@ class BootstrapResettableStaticTestCase extends DrupalUnitTestCase {
 /**
  * Test miscellaneous functions in bootstrap.inc.
  */
-class BootstrapMiscTestCase extends DrupalUnitTestCase {
+class BootstrapMiscTestCase extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
@@ -455,7 +455,7 @@ class BootstrapMiscTestCase extends DrupalUnitTestCase {
 /**
  * Tests for overriding server variables via the API.
  */
-class BootstrapOverrideServerVariablesTestCase extends DrupalUnitTestCase {
+class BootstrapOverrideServerVariablesTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Overriding server variables',
diff --git modules/simpletest/tests/common.test modules/simpletest/tests/common.test
index ca29e11..7b489be 100644
--- modules/simpletest/tests/common.test
+++ modules/simpletest/tests/common.test
@@ -348,7 +348,7 @@ class CommonURLUnitTest extends DrupalWebTestCase {
 /**
  * Tests for the check_plain() and filter_xss() functions.
  */
-class CommonXssUnitTest extends DrupalUnitTestCase {
+class CommonXssUnitTest extends DrupalWebTestCase {
 
   public static function getInfo() {
     return array(
@@ -401,7 +401,7 @@ class CommonXssUnitTest extends DrupalUnitTestCase {
   }
 }
 
-class CommonSizeTestCase extends DrupalUnitTestCase {
+class CommonSizeTestCase extends DrupalWebTestCase {
   protected $exact_test_cases;
   protected $rounded_test_cases;
 
@@ -790,7 +790,7 @@ class CascadingStylesheetsTestCase extends DrupalWebTestCase {
 /**
  * Test for cleaning HTML identifiers.
  */
-class DrupalHTMLIdentifierTestCase extends DrupalUnitTestCase {
+class DrupalHTMLIdentifierTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'HTML identifiers',
@@ -850,7 +850,7 @@ class DrupalHTMLIdentifierTestCase extends DrupalUnitTestCase {
 /**
  * CSS Unit Tests.
  */
-class CascadingStylesheetsUnitTest extends DrupalUnitTestCase {
+class CascadingStylesheetsUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'CSS Unit Tests',
@@ -1669,7 +1669,7 @@ class DrupalRenderTestCase extends DrupalWebTestCase {
 /**
  * Test for valid_url().
  */
-class ValidUrlTestCase extends DrupalUnitTestCase {
+class ValidUrlTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Valid Url',
@@ -2198,7 +2198,7 @@ class FormatDateUnitTest extends DrupalWebTestCase {
 /**
  * Tests for the format_date() function.
  */
-class DrupalAttributesUnitTest extends DrupalUnitTestCase {
+class DrupalAttributesUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'HTML Attributes',
@@ -2238,7 +2238,7 @@ class DrupalAttributesUnitTest extends DrupalUnitTestCase {
 /**
  * Tests converting PHP variables to JSON strings and back.
  */
-class DrupalJSONTest extends DrupalUnitTestCase {
+class DrupalJSONTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'JSON',
diff --git modules/simpletest/tests/graph.test modules/simpletest/tests/graph.test
index 36d91bf..03a050b 100644
--- modules/simpletest/tests/graph.test
+++ modules/simpletest/tests/graph.test
@@ -9,7 +9,7 @@
 /**
  * Unit tests for the graph handling features.
  */
-class GraphUnitTest extends DrupalUnitTestCase {
+class GraphUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Graph',
diff --git modules/simpletest/tests/menu.test modules/simpletest/tests/menu.test
index c25240e..071014e 100644
--- modules/simpletest/tests/menu.test
+++ modules/simpletest/tests/menu.test
@@ -793,7 +793,7 @@ class MenuRebuildTestCase extends DrupalWebTestCase {
 /**
  * Menu tree data related tests.
  */
-class MenuTreeDataTestCase extends DrupalUnitTestCase {
+class MenuTreeDataTestCase extends DrupalWebTestCase {
   /**
    * Dummy link structure acceptable for menu_tree_data().
    */
diff --git modules/simpletest/tests/theme.test modules/simpletest/tests/theme.test
index d7d734b..ab975ce 100644
--- modules/simpletest/tests/theme.test
+++ modules/simpletest/tests/theme.test
@@ -190,7 +190,7 @@ class ThemeItemListUnitTest extends DrupalWebTestCase {
 /**
  * Unit tests for theme_links().
  */
-class ThemeLinksUnitTest extends DrupalUnitTestCase {
+class ThemeLinksUnitTest extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Links',
diff --git modules/system/system.test modules/system/system.test
index 549df44..2ef3bab 100644
--- modules/system/system.test
+++ modules/system/system.test
@@ -1661,7 +1661,7 @@ class TokenReplaceTestCase extends DrupalWebTestCase {
   }
 }
 
-class InfoFileParserTestCase extends DrupalUnitTestCase {
+class InfoFileParserTestCase extends DrupalWebTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Info file format parser',