diff --git a/core/lib/Drupal/Core/Entity/EditorialContentEntityBase.php b/core/lib/Drupal/Core/Entity/EditorialContentEntityBase.php
index 85e2e6b..ff6abcd 100644
--- a/core/lib/Drupal/Core/Entity/EditorialContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/EditorialContentEntityBase.php
@@ -2,8 +2,6 @@
 
 namespace Drupal\Core\Entity;
 
-use Drupal\Core\Field\BaseFieldDefinition;
-
 /**
  * Provides a base entity class with extended revision and publishing support.
  *
diff --git a/core/modules/system/src/Tests/Update/EntityUpdateAddRevisionTranslationAffected.php b/core/modules/system/src/Tests/Update/EntityUpdateAddRevisionTranslationAffectedTest.php
similarity index 93%
rename from core/modules/system/src/Tests/Update/EntityUpdateAddRevisionTranslationAffected.php
rename to core/modules/system/src/Tests/Update/EntityUpdateAddRevisionTranslationAffectedTest.php
index ad405de..190e175 100644
--- a/core/modules/system/src/Tests/Update/EntityUpdateAddRevisionTranslationAffected.php
+++ b/core/modules/system/src/Tests/Update/EntityUpdateAddRevisionTranslationAffectedTest.php
@@ -11,7 +11,7 @@
  *
  * @group Update
  */
-class EntityUpdateAddRevisionTranslationAffected extends UpdatePathTestBase {
+class EntityUpdateAddRevisionTranslationAffectedTest extends UpdatePathTestBase {
 
   use EntityDefinitionTestTrait;
   use DbUpdatesTrait;
@@ -81,7 +81,7 @@ public function testAddingTheRevisionTranslationAffectedField() {
 
     // Check that the correct initial value was set when the field was
     // installed.
-    $entity = \Drupal::entityTypeManager()->getStorage('entity_test_update')->load(1);
+    $entity = $this->entityManager->getStorage('entity_test_update')->load(1);
     $this->assertTrue($entity->revision_translation_affected->value);
   }