diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilder.php b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
index e31ed77..5cb89f7 100644
--- a/core/lib/Drupal/Core/Entity/EntityListBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityListBuilder.php
@@ -228,6 +228,7 @@ public function render() {
       '#empty' => $this->t('There is no @label yet.', array('@label' => $this->entityType->getLabel())),
       '#cache' => [
         'contexts' => $this->entityType->getListCacheContexts(),
+        'tags' => $this->entityType->getListCacheTags(),
       ],
     );
     foreach ($this->load() as $entity) {
diff --git a/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php b/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
index e32b689..f38c62d 100644
--- a/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
@@ -70,4 +70,12 @@ public function testCacheContexts() {
     $this->assertEqual(['entity_test_view_grants', 'languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'url.query_args.pagers:0', 'user.permissions'], $build['#cache']['contexts']);
   }
 
+  /**
+   * Tests if the list cache tags are set.
+   */
+  public function testCacheTags() {
+    $this->drupalGet('entity_test/list');
+    $this->assertCacheTag('entity_test_list');
+  }
+
 }