diff --git a/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php b/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
index 38257ee..a734420 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
@@ -2,9 +2,12 @@
 
 namespace Drupal\KernelTests\Core\Entity;
 
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\entity_test_revlog\Entity\EntityTestMulWithRevisionLog;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\user\Entity\User;
+use Drupal\user\UserInterface;
 
 /**
  * @coversDefaultClass \Drupal\Core\Entity\RevisionableContentEntityBase
@@ -18,28 +21,6 @@ class RevisionableContentEntityBaseTest extends KernelTestBase {
   public static $modules = ['entity_test_revlog', 'system', 'user'];
 
   /**
-   * The entity where revisions will be created.
-   *
-   * @var \Drupal\entity_test_revlog\Entity\EntityTestMulWithRevisionLog
-   */
-  protected $entity;
-
-  /**
-   * The user author of the revisions.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $user;
-
-  /**
-   * The definition and metada of the entity being tested.
-   *
-   * @var Drupal\Core\Entity\EntityTypeInterface
-   */
-  protected $definition;
-
-
-  /**
    * {@inheritdoc}
    */
   protected function setUp() {
@@ -51,76 +32,92 @@ protected function setUp() {
   }
 
   public function testRevisionableContentEntity() {
-    $this->user = User::create(['name' => 'test name']);
-    $this->user->save();
     $entity_type = 'entity_test_mul_revlog';
-    $this->definition = \Drupal::entityManager()->getDefinition($entity_type);
-    /** @var \Drupal\entity_test_revlog\Entity\EntityTestMulWithRevisionLog $entity */
-    $this->entity = EntityTestMulWithRevisionLog::create(['type' => $entity_type]);
+    $definition = \Drupal::entityManager()->getDefinition($entity_type);
+    $user = User::create(['name' => 'test name']);
+    $user->save();
+    /** @var \Drupal\entity_test_mul_revlog\Entity\EntityTestMulWithRevisionLog $entity */
+    $entity = EntityTestMulWithRevisionLog::create([
+      'type' => $entity_type,
+    ]);
 
     // Save the entity, this creates the first revision.
-    $this->entity->save();
-    $revision_ids[] = $this->entity->getRevisionId();
-    $this->assertItemsTableCount(1);
+    $entity->save();
+    $revision_ids[] = $entity->getRevisionId();
+    $this->assertItemsTableCount(1, $definition);
 
     // Create the second revision.
+    $entity->setNewRevision(TRUE);
     $random_timestamp = rand(1e8, 2e8);
-    $this->createRevision($random_timestamp, 'This is my log message');
-    $this->assertItemsTableCount(2);
-    $revision_ids[] = $this->entity->getRevisionId();
+    $this->createRevision($entity, $user, $random_timestamp, 'This is my log message');
+
+    $revision_id = $entity->getRevisionId();
+    $revision_ids[] = $revision_id;
 
     $storage = \Drupal::entityTypeManager()->getStorage('entity_test_mul_revlog');
-    $entity = $storage->loadRevision($this->entity->getRevisionId());
+    $entity = $storage->loadRevision($revision_id);
     $this->assertEquals($random_timestamp, $entity->getRevisionCreationTime());
-    $this->assertEquals($this->user->id(), $entity->getRevisionUserId());
-    $this->assertEquals($this->user->id(), $entity->getRevisionUser()->id());
+    $this->assertEquals($user->id(), $entity->getRevisionUserId());
+    $this->assertEquals($user->id(), $entity->getRevisionUser()->id());
     $this->assertEquals('This is my log message', $entity->getRevisionLogMessage());
 
+    // Create the third revision.
+    $random_timestamp = rand(1e8, 2e8);
+    $this->createRevision($entity, $user, $random_timestamp, 'This is my log message');
+    $this->assertItemsTableCount(3, $definition);
+    $revision_ids[] = $entity->getRevisionId();
+
     // Create another 3 revisions.
     foreach (range(1, 3) as $count) {
       $timestamp = rand(1e8, 2e8);
-      $this->createRevision($timestamp, 'This is my log message number: ' . $count);
-      $revision_ids[] = $this->entity->getRevisionId();
+      $this->createRevision($entity, $user, $timestamp, 'This is my log message number: ' . $count);
+      $revision_ids[] = $entity->getRevisionId();
     }
-    $this->assertItemsTableCount(5);
+    $this->assertItemsTableCount(6, $definition);
 
-    $this->assertEqual(5, count($revision_ids));
+    $this->assertEqual(6, count($revision_ids));
 
     // Delete the first 3 revisions.
     foreach (range(0, 2) as $key) {
       $storage->deleteRevision($revision_ids[$key]);
     }
 
-    // We should have only data for two revisions.
-    $this->assertItemsTableCount(2);
+    // We should have only data for three revisions.
+    $this->assertItemsTableCount(3, $definition);
   }
 
   /**
    * Asserts the ammount of items on entity related tables.
    *
    * @param int $count
+   *   The number of items expected to be in revisions related tables.
+   * @param Drupal\Core\Entity\EntityTypeInterface $definition
+   *   The definition and metada of the entity being tested.
    */
-  protected function assertItemsTableCount($count) {
-    $this->assertEqual(1, db_query('SELECT COUNT(*) FROM {' . $this->definition->getBaseTable() . '}')->fetchField());
-    $this->assertEqual(1, db_query('SELECT COUNT(*) FROM {' . $this->definition->getDataTable() . '}')->fetchField());
-    $this->assertEqual($count, db_query('SELECT COUNT(*) FROM {' . $this->definition->getRevisionTable() . '}')->fetchField());
-    $this->assertEqual($count, db_query('SELECT COUNT(*) FROM {' . $this->definition->getRevisionDataTable() . '}')->fetchField());
+  protected function assertItemsTableCount($count, EntityTypeInterface $definition) {
+    $this->assertEqual(1, db_query('SELECT COUNT(*) FROM {' . $definition->getBaseTable() . '}')->fetchField());
+    $this->assertEqual(1, db_query('SELECT COUNT(*) FROM {' . $definition->getDataTable() . '}')->fetchField());
+    $this->assertEqual($count, db_query('SELECT COUNT(*) FROM {' . $definition->getRevisionTable() . '}')->fetchField());
+    $this->assertEqual($count, db_query('SELECT COUNT(*) FROM {' . $definition->getRevisionDataTable() . '}')->fetchField());
   }
 
   /**
    * Creates a new revision in the entity of this test class.
    *
+   * @param Drupal\Core\Entity\EntityInterface $entity
+   *   The entity where revision will be created.
+   * @param Drupal\user\UserInterface $user
+   *   The author of the new revision.
    * @param int $timestamp
    *   The timestamp of the new revision.
    * @param string $log_message
    *   The log message of the new revision.
    */
-  protected function createRevision($timestamp, $log_message) {
-    $this->entity->setNewRevision(TRUE);
-    $this->entity->setRevisionCreationTime($timestamp);
-    $this->entity->setRevisionUserId($this->user->id());
-    $this->entity->setRevisionLogMessage($log_message);
-    $this->entity->save();
+  protected function createRevision(EntityInterface $entity, UserInterface $user, $timestamp, $log_message) {
+    $entity->setNewRevision(TRUE);
+    $entity->setRevisionCreationTime($timestamp);
+    $entity->setRevisionUserId($user->id());
+    $entity->setRevisionLogMessage($log_message);
+    $entity->save();
   }
-
 }