diff --git a/core/modules/simpletest/tests/common.test b/core/modules/simpletest/tests/common.test
index 5bad4ef..7dd9ca7 100644
--- a/core/modules/simpletest/tests/common.test
+++ b/core/modules/simpletest/tests/common.test
@@ -524,7 +524,7 @@ class CommonSizeUnitTestCase extends DrupalUnitTestCase {
 /**
  * Test drupal_explode_tags() and drupal_implode_tags().
  */
-class CommonAutocompleteTagsTestCase extends DrupalWebTestCase {
+class CommonAutocompleteTagsTestCase extends DrupalUnitTestCase {
   var $validTags = array(
     'Drupal' => 'Drupal',
     'Drupal with some spaces' => 'Drupal with some spaces',
@@ -1035,7 +1035,7 @@ class CommonDrupalHTTPRequestTestCase extends DrupalWebTestCase {
 /**
  * Tests drupal_add_region_content() and drupal_get_region_content().
  */
-class CommonRegionContentTestCase extends DrupalWebTestCase {
+class CommonRegionContentTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Region content',
@@ -2171,7 +2171,7 @@ class CommonSimpleTestErrorCollectorTestCase extends DrupalWebTestCase {
 /**
  * Tests the drupal_parse_info_file() API function.
  */
-class CommonDrupalParseInfoFileTestCase extends DrupalWebTestCase {
+class CommonDrupalParseInfoFileTestCase extends DrupalUnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Parsing .info files',
diff --git a/core/modules/simpletest/tests/image.test b/core/modules/simpletest/tests/image.test
index daf5394..e215ee9 100644
--- a/core/modules/simpletest/tests/image.test
+++ b/core/modules/simpletest/tests/image.test
@@ -194,7 +194,7 @@ class ImageToolkitUnitTest extends ImageToolkitTestCase {
 /**
  * Test the core GD image manipulation functions.
  */
-class ImageToolkitGdTestCase extends DrupalWebTestCase {
+class ImageToolkitGdTestCase extends DrupalUnitTestCase {
   // Colors that are used in testing.
   protected $black       = array(0, 0, 0, 0);
   protected $red         = array(255, 0, 0, 0);
diff --git a/core/modules/simpletest/tests/unicode.test b/core/modules/simpletest/tests/unicode.test
index 5cadb8a..c50a437 100644
--- a/core/modules/simpletest/tests/unicode.test
+++ b/core/modules/simpletest/tests/unicode.test
@@ -8,7 +8,7 @@
 /**
  * Test unicode handling features implemented in unicode.inc.
  */
-class UnicodeUnitTest extends DrupalWebTestCase {
+class UnicodeUnitTest extends DrupalUnitTestCase {
 
   /**
    * Whether to run the extended version of the tests (including non latin1 characters).
diff --git a/core/modules/simpletest/tests/xmlrpc.test b/core/modules/simpletest/tests/xmlrpc.test
index 60b9624..070993f 100644
--- a/core/modules/simpletest/tests/xmlrpc.test
+++ b/core/modules/simpletest/tests/xmlrpc.test
@@ -3,7 +3,7 @@
 /**
  * Perform basic XML-RPC tests that do not require addition callbacks.
  */
-class XMLRPCBasicTestCase extends DrupalWebTestCase {
+class XMLRPCBasicTestCase extends DrupalUnitTestCase {
 
   public static function getInfo() {
     return array(