diff --git a/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php b/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php
index 13cfd10..c6d9693 100644
--- a/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php
+++ b/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php
@@ -48,26 +48,41 @@ public static function preCreate(EntityStorageInterface $storage, array &$values
    * {@inheritdoc}
    */
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
-    $fields['id'] = BaseFieldDefinition::create('integer')
+    // This entity type is used for generating database dumps from Drupal
+    // 8.0.0-rc1, which didn't have the entity key base fields defined in
+    // the parent class (ContentEntityBase), so we have to duplicate them here.
+
+    $fields[$entity_type->getKey('id')] = BaseFieldDefinition::create('integer')
       ->setLabel(new TranslatableMarkup('ID'))
       ->setDescription(new TranslatableMarkup('The ID of the test entity.'))
       ->setReadOnly(TRUE)
       ->setSetting('unsigned', TRUE);
 
-    $fields['uuid'] = BaseFieldDefinition::create('uuid')
+    $fields[$entity_type->getKey('uuid')] = BaseFieldDefinition::create('uuid')
       ->setLabel(new TranslatableMarkup('UUID'))
       ->setDescription(new TranslatableMarkup('The UUID of the test entity.'))
       ->setReadOnly(TRUE);
 
-    $fields['type'] = BaseFieldDefinition::create('string')
+    $fields[$entity_type->getKey('bundle')] = BaseFieldDefinition::create('string')
       ->setLabel(new TranslatableMarkup('Type'))
       ->setDescription(new TranslatableMarkup('The bundle of the test entity.'))
       ->setRequired(TRUE);
 
-    $fields['langcode'] = BaseFieldDefinition::create('language')
-      ->setLabel(new TranslatableMarkup('Language code'))
-      ->setDescription(new TranslatableMarkup('The language code of the test entity.'))
-      ->setTranslatable(TRUE);
+    if ($entity_type->hasKey('revision')) {
+      $fields[$entity_type->getKey('revision')] = BaseFieldDefinition::create('integer')
+        ->setLabel(new TranslatableMarkup('Revision ID'))
+        ->setReadOnly(TRUE)
+        ->setSetting('unsigned', TRUE);
+    }
+
+    $fields[$entity_type->getKey('langcode')] = BaseFieldDefinition::create('language')
+      ->setLabel(new TranslatableMarkup('Language'));
+    if ($entity_type->isRevisionable()) {
+      $fields[$entity_type->getKey('langcode')]->setRevisionable(TRUE);
+    }
+    if ($entity_type->isTranslatable()) {
+      $fields[$entity_type->getKey('langcode')]->setTranslatable(TRUE);
+    }
 
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(new TranslatableMarkup('Name'))