diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
index a0d2a59..b23c796 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
@@ -170,13 +170,9 @@ public function testGetStorageClass() {
    */
   public function testSetStorageClass() {
     $controller = $this->getTestHandlerClass();
-    $entity_type = $this->setUpEntityType(array(
-      'handlers' => array(
-        'storage' => $controller,
-      ),
-    ));
-    $updated_entity_type = $entity_type->setStorageClass($controller . 'NewTest');
-    $this->assertSame($controller . 'NewTest', $updated_entity_type->handlers['storage']);
+    $entity_type = $this->setUpEntityType(array());
+    $entity_type->setStorageClass($controller);
+    $this->assertSame($controller, $entity_type->getHandlerClass('storage'));
   }
 
   /**