diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php
index a63415b..89b83cf 100644
--- a/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/EntityType.php
@@ -482,6 +482,7 @@ public function getStorageClass() {
   public function setStorageClass($class) {
     $this->checkStorageClass($class);
     $this->handlers['storage'] = $class;
+    return $this;
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
index 8ee7478..d633afc 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
@@ -166,6 +166,15 @@ public function testGetStorageClass() {
   }
 
   /**
+   * Tests the setStorageClass() method.
+   */
+  public function testSetStorageClass() {
+    $controller = $this->getTestHandlerClass();
+    $entity_type = $this->setUpEntityType(array());
+    $this->assertSame($entity_type, $entity_type->setStorageClass($controller));
+  }
+
+  /**
    * Tests the getListBuilderClass() method.
    */
   public function testGetListBuilderClass() {