diff --git a/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.module b/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.module
deleted file mode 100644
index b3d9bbc..0000000
--- a/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.module
+++ /dev/null
@@ -1 +0,0 @@
-<?php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php
index 4c4291f..7435100 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php
@@ -484,8 +484,8 @@ public function testDataStructureInterfaces() {
    * @param string $entity_type
    *   The entity type to run the tests with.
    */
-  protected function assertDataStructureInterfaces($entity_type_id) {
-    $entity = $this->createTestEntity($entity_type_id);
+  protected function assertDataStructureInterfaces($entity_type) {
+    $entity = $this->createTestEntity($entity_type);
 
     // Test using the whole tree of typed data by navigating through the tree of
     // contained properties and getting all contained strings, limited by a
@@ -505,12 +505,7 @@ protected function assertDataStructureInterfaces($entity_type_id) {
       // Field format.
       NULL,
     );
-    // Add the "log" NULL value for revisionable entity types.
-    $entity_type = $this->entityManager->getDefinition($entity_type_id);
-    if ($entity_type->hasKey('revision')) {
-      array_splice($target_strings, 4, 0, array(NULL));
-    }
-    $this->assertEqual($strings, $target_strings, format_string('%entity_type: All contained strings found.', array('%entity_type' => $entity_type_id)));
+    $this->assertEqual($strings, $target_strings, format_string('%entity_type: All contained strings found.', array('%entity_type' => $entity_type)));
   }
 
   /**
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
index bc2d36a..55a1611 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
@@ -86,8 +86,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['type'] = FieldDefinition::create('string')
       ->setLabel(t('Type'))
       ->setDescription(t('The bundle of the test entity.'))
-      ->setRequired(TRUE)
-      ->setSetting('max_length', 32);
+      ->setRequired(TRUE);
 
     $fields['user_id'] = FieldDefinition::create('entity_reference')
       ->setLabel(t('User ID'))
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
index 6f98e44..b6b660e 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
@@ -60,25 +60,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setDescription(t('The version id of the test entity.'))
       ->setReadOnly(TRUE);
 
-    $fields['revision_timestamp'] = FieldDefinition::create('timestamp')
-      ->setLabel(t('Revision timestamp'))
-      ->setDescription(t('The time that the current revision was created.'))
-      ->setQueryable(FALSE)
-      ->setRevisionable(TRUE);
-
-    $fields['revision_uid'] = FieldDefinition::create('entity_reference')
-      ->setLabel(t('Revision user ID'))
-      ->setDescription(t('The user ID of the author of the current revision.'))
-      ->setSettings(array('target_type' => 'user'))
-      ->setQueryable(FALSE)
-      ->setRevisionable(TRUE);
-
-    $fields['log'] = FieldDefinition::create('string')
-      ->setLabel(t('Log'))
-      ->setDescription(t('The log entry explaining the changes in this revision.'))
-      ->setRevisionable(TRUE)
-      ->setTranslatable(TRUE);
-
     $fields['langcode']->setRevisionable(TRUE);
     $fields['name']->setRevisionable(TRUE);
     $fields['user_id']->setRevisionable(TRUE);