diff --git a/core/modules/system/src/Tests/Entity/DefaultTableMappingIntegrationTest.php b/core/tests/Drupal/KernelTests/Core/Entity/DefaultTableMappingIntegrationTest.php
similarity index 78%
rename from core/modules/system/src/Tests/Entity/DefaultTableMappingIntegrationTest.php
rename to core/tests/Drupal/KernelTests/Core/Entity/DefaultTableMappingIntegrationTest.php
index 71d8211..edb8a24 100644
--- a/core/modules/system/src/Tests/Entity/DefaultTableMappingIntegrationTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/DefaultTableMappingIntegrationTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Entity\DefaultTableMappingIntegrationTest.
+ * Contains \Drupal\KernelTests\Core\Entity\DefaultTableMappingIntegrationTest.
  */
 
-namespace Drupal\system\Tests\Entity;
+namespace Drupal\KernelTests\Core\Entity;
 
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -16,9 +16,10 @@
  * @see \Drupal\Core\Entity\Sql\DefaultTableMapping
  * @see \Drupal\Core\Entity\Sql\TableMappingInterface
  *
+ * @coversDefaultClass \Drupal\Core\Entity\Sql\DefaultTableMapping
  * @group Entity
  */
-class DefaultTableMappingIntegrationTest extends EntityUnitTestBase {
+class DefaultTableMappingIntegrationTest extends EntityKernelTestBase {
 
   /**
    * The table mapping for the tested entity type.
@@ -59,17 +60,17 @@ public function testGetFieldTableName() {
     // Test the field table name for a single-valued base field, which is stored
     // in the entity's base table.
     $expected = 'entity_test_mulrev';
-    $this->assertEqual($this->tableMapping->getFieldTableName('uuid'), $expected);
+    $this->assertEquals($this->tableMapping->getFieldTableName('uuid'), $expected);
 
     // Test the field table name for a translatable and revisionable base field,
     // which is stored in the entity's data table.
     $expected = 'entity_test_mulrev_property_data';
-    $this->assertEqual($this->tableMapping->getFieldTableName('name'), $expected);
+    $this->assertEquals($this->tableMapping->getFieldTableName('name'), $expected);
 
     // Test the field table name for a multi-valued base field, which is stored
     // in a dedicated table.
     $expected = 'entity_test_mulrev__multivalued_base_field';
-    $this->assertEqual($this->tableMapping->getFieldTableName('multivalued_base_field'), $expected);
+    $this->assertEquals($this->tableMapping->getFieldTableName('multivalued_base_field'), $expected);
   }
 
 }