diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index 98aad99..e0fa4c2 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -9,8 +9,7 @@
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\field\Tests\FieldItemTestBase;
-use Drupal\simpletest\WebTestBase;
+use Drupal\field\Tests\FieldTypeTestBase;
 use Drupal\Core\Datetime\DrupalDateTime;
 
 /**
@@ -18,7 +17,7 @@
  *
  * @group datetime
  */
-class DateTimeFieldTest extends FieldItemTestBase {
+class DateTimeFieldTest extends FieldTypeTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field/src/Tests/Email/EmailFieldTest.php b/core/modules/field/src/Tests/Email/EmailFieldTest.php
index 552cad2..3672cfb 100644
--- a/core/modules/field/src/Tests/Email/EmailFieldTest.php
+++ b/core/modules/field/src/Tests/Email/EmailFieldTest.php
@@ -8,14 +8,14 @@
 namespace Drupal\field\Tests\Email;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\field\Tests\FieldItemTestBase;
+use Drupal\field\Tests\FieldTypeTestBase;
 
 /**
  * Tests email field functionality.
  *
  * @group field
  */
-class EmailFieldTest extends FieldItemTestBase {
+class EmailFieldTest extends FieldTypeTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field/src/Tests/FieldTypeTestBase.php b/core/modules/field/src/Tests/FieldTypeTestBase.php
index a82901e..7ae7c22 100644
--- a/core/modules/field/src/Tests/FieldTypeTestBase.php
+++ b/core/modules/field/src/Tests/FieldTypeTestBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\field\Tests\FieldItemTestBase.
+ * Contains \Drupal\field\Tests\FieldTypeTestBase.
  */
 
 namespace Drupal\field\Tests;
diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php
index a1abf41..994e96a 100644
--- a/core/modules/field/src/Tests/Number/NumberFieldTest.php
+++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php
@@ -8,15 +8,14 @@
 namespace Drupal\field\Tests\Number;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\field\Tests\FieldItemTestBase;
-use Drupal\simpletest\WebTestBase;
+use Drupal\field\Tests\FieldTypeTestBase;
 
 /**
  * Tests the creation of numeric fields.
  *
  * @group field
  */
-class NumberFieldTest extends FieldItemTestBase {
+class NumberFieldTest extends FieldTypeTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/field/src/Tests/String/StringFieldTest.php b/core/modules/field/src/Tests/String/StringFieldTest.php
index faee5a5..faebcee 100644
--- a/core/modules/field/src/Tests/String/StringFieldTest.php
+++ b/core/modules/field/src/Tests/String/StringFieldTest.php
@@ -8,14 +8,14 @@
 namespace Drupal\field\Tests\String;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\field\Tests\FieldItemTestBase;
+use Drupal\field\Tests\FieldTypeTestBase;
 
 /**
  * Tests the creation of string fields.
  *
  * @group text
  */
-class StringFieldTest extends FieldItemTestBase {
+class StringFieldTest extends FieldTypeTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/image/src/Tests/ImageFieldTestBase.php b/core/modules/image/src/Tests/ImageFieldTestBase.php
index 554954b..9b374f4 100644
--- a/core/modules/image/src/Tests/ImageFieldTestBase.php
+++ b/core/modules/image/src/Tests/ImageFieldTestBase.php
@@ -7,8 +7,7 @@
 
 namespace Drupal\image\Tests;
 
-use Drupal\field\Tests\FieldItemTestBase;
-use Drupal\simpletest\WebTestBase;
+use Drupal\field\Tests\FieldTypeTestBase;
 
 /**
  * TODO: Test the following functions.
@@ -26,7 +25,7 @@
 /**
  * This class provides methods specifically for testing Image's field handling.
  */
-abstract class ImageFieldTestBase extends FieldItemTestBase {
+abstract class ImageFieldTestBase extends FieldTypeTestBase {
 
   /**
    * Modules to enable.