diff --git a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
index dafc5d0..fc9e56f 100644
--- a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
+++ b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
@@ -158,10 +158,8 @@ public function initializeMapping() {
     // Make sure the key fields come first in the list of fields.
     $all_fields = array_merge($key_fields, array_diff($all_fields, $key_fields));

-    $revisionable = $this->entityType->isRevisionable();
     $revision_metadata_fields = $revisionable ? array_values($this->entityType->getRevisionMetadataKeys()) : [];

-    $translatable = $this->entityType->isTranslatable();
     if (!$revisionable && !$translatable) {
       // The base layout stores all the base field values in the base table.
       $this->setFieldNames($this->baseTable, $all_fields);
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
index 361ff17..e77b6e0 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
@@ -173,7 +173,7 @@ public function providerTestGetBaseTable() {
    * @dataProvider providerTestGetRevisionTable
    */
   public function testGetRevisionTable($revision_table, $expected) {
-    $this->entityType->expects($this->exactly(3))
+    $this->entityType->expects($this->exactly(2))
       ->method('isRevisionable')
       ->will($this->returnValue(TRUE));
     $this->entityType->expects($this->once())
@@ -214,7 +214,7 @@ public function providerTestGetRevisionTable() {
    * @covers ::getDataTable
    */
   public function testGetDataTable() {
-    $this->entityType->expects($this->exactly(3))
+    $this->entityType->expects($this->exactly(2))
       ->method('isTranslatable')
       ->will($this->returnValue(TRUE));
     $this->entityType->expects($this->exactly(1))
@@ -244,10 +244,10 @@ public function testGetDataTable() {
    * @dataProvider providerTestGetRevisionDataTable
    */
   public function testGetRevisionDataTable($revision_data_table, $expected) {
-    $this->entityType->expects($this->exactly(3))
+    $this->entityType->expects($this->exactly(2))
       ->method('isRevisionable')
       ->will($this->returnValue(TRUE));
-    $this->entityType->expects($this->exactly(3))
+    $this->entityType->expects($this->exactly(2))
       ->method('isTranslatable')
       ->will($this->returnValue(TRUE));
     $this->entityType->expects($this->exactly(1))
@@ -532,7 +532,7 @@ public function testGetTableMappingRevisionable(array $entity_keys) {
       'uuid' => $entity_keys['uuid'],
     ];

-    $this->entityType->expects($this->exactly(3))
+    $this->entityType->expects($this->exactly(2))
       ->method('isRevisionable')
       ->will($this->returnValue(TRUE));
     $this->entityType->expects($this->any())
@@ -605,7 +605,7 @@ public function testGetTableMappingRevisionableWithFields(array $entity_keys) {
       $field_names = array_merge($field_names, $revisionable_field_names);
       $this->fieldDefinitions += $this->mockFieldDefinitions(array_merge($revisionable_field_names, array_values($revision_metadata_field_names)), ['isRevisionable' => TRUE]);

-      $this->entityType->expects($this->exactly(3))
+      $this->entityType->expects($this->exactly(2))
         ->method('isRevisionable')
         ->will($this->returnValue(TRUE));
       $this->entityType->expects($this->any())