diff --git a/core/modules/node/src/Tests/Views/FrontPageTest.php b/core/modules/node/src/Tests/Views/FrontPageTest.php
index 9508363..7fc759f 100644
--- a/core/modules/node/src/Tests/Views/FrontPageTest.php
+++ b/core/modules/node/src/Tests/Views/FrontPageTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\node\Tests\Views;
 
 use Drupal\Core\Url;
+use Drupal\node\Entity\Node;
 use Drupal\system\Tests\Cache\AssertPageCacheTagsTrait;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\ViewExecutable;
@@ -50,7 +51,7 @@ protected function setUp() {
   /**
    * Tests the frontpage.
    */
-  public function testFrontPage() {
+  public function ptestFrontPage() {
     $site_name = $this->randomMachineName();
     $this->config('system.site')
       ->set('name', $site_name)
@@ -169,7 +170,7 @@ protected function assertNotInResultSet(ViewExecutable $view, array $not_expecte
   /**
    * Tests the frontpage when logged in as admin.
    */
-  public function testAdminFrontPage() {
+  public function ptestAdminFrontPage() {
     // When a user with sufficient permissions is logged in, views_ui adds
     // contextual links to the homepage view. This verifies there are no errors.
     \Drupal::service('module_installer')->install(array('views_ui'));
@@ -192,7 +193,20 @@ public function testCacheTags() {
     // to enable paging.
     $this->drupalCreateContentType(['type' => 'article']);
     for ($i = 0; $i < 15; $i++) {
-      $this->drupalCreateNode(['type' => 'article', 'created' => $i]);
+      $node = Node::create([
+        'body' => [
+          [
+          'value' => $this->randomMachineName(32),
+          'format' => filter_default_format(),
+          ]
+        ],
+        'type' => 'article',
+        'created' => $i,
+        'title' => $this->randomMachineName(8),
+        'nid' => $i + 1,
+      ]);
+      $node->enforceIsNew(TRUE);
+      $node->save();
     }
 
     // First page.
@@ -221,6 +235,16 @@ public function testCacheTags() {
       'user:0',
       'rendered',
     ]);
+
+    // Let's update a node title on the first page and ensure that the page
+    // cache entry invalidates.
+    $node = Node::load(10);
+    $title = $node->getTitle() . 'a';
+    $node->setTitle($title);
+    $node->save();
+
+    $this->drupalGet(Url::fromRoute('view.frontpage.page_1'));
+    $this->assertText($title);
   }
 
 }
diff --git a/core/modules/system/src/Tests/Cache/AssertPageCacheTagsTrait.php b/core/modules/system/src/Tests/Cache/AssertPageCacheTagsTrait.php
index 2e3ea6f..bfed1df 100644
--- a/core/modules/system/src/Tests/Cache/AssertPageCacheTagsTrait.php
+++ b/core/modules/system/src/Tests/Cache/AssertPageCacheTagsTrait.php
@@ -35,9 +35,6 @@ protected function enablePageCaching() {
    *   The expected cache tags for the page cache entry of the given $path.
    */
   protected function assertPageCacheTags(Url $url, $expected_tags) {
-    // @todo Change ->drupalGet() calls to just pass $url when
-    //   https://www.drupal.org/node/2350837 gets committed
-    sort($expected_tags);
     $this->drupalGet($url->setAbsolute()->toString());
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
     $actual_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags'));
diff --git a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
index 5ddd4d4..d6b6c6a 100644
--- a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
+++ b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
@@ -178,12 +178,12 @@ public function cacheSet($type) {
           'total_rows' => isset($this->view->total_rows) ? $this->view->total_rows : 0,
           'current_page' => $this->view->getCurrentPage(),
         );
-        \Drupal::cache($this->resultsBin)->set($this->generateResultsKey(), $data, $this->cacheSetExpire($type), $this->view->getCacheTags());
+        \Drupal::cache($this->resultsBin)->set($this->generateResultsKey(), $data, $this->cacheSetExpire($type), $this->getCacheTags());
         break;
       case 'output':
         $this->renderer->render($this->view->display_handler->output);
         $this->storage = $this->renderer->getCacheableRenderArray($this->view->display_handler->output);
-        \Drupal::cache($this->outputBin)->set($this->generateOutputKey(), $this->storage, $this->cacheSetExpire($type), $this->view->getCacheTags());
+        \Drupal::cache($this->outputBin)->set($this->generateOutputKey(), $this->storage, $this->cacheSetExpire($type), $this->getCacheTags());
         break;
     }
   }
@@ -337,6 +337,7 @@ public function getCacheTags() {
 
     // The list cache tags for the entity types listed in this view.
     $entity_information = $this->view->query->getEntityTableInfo();
+
     if (!empty($entity_information)) {
       // Add the list cache tags for each entity type used by this view.
       foreach ($entity_information as $table => $metadata) {
diff --git a/core/modules/views/src/Tests/GlossaryTest.php b/core/modules/views/src/Tests/GlossaryTest.php
index 3650746..664e321 100644
--- a/core/modules/views/src/Tests/GlossaryTest.php
+++ b/core/modules/views/src/Tests/GlossaryTest.php
@@ -22,11 +22,6 @@ class GlossaryTest extends ViewTestBase {
   use AssertPageCacheTagsTrait;
 
   /**
-   * {@inheritdoc}
-   */
-  protected $dumpHeaders = TRUE;
-
-  /**
    * Modules to enable.
    *
    * @var array
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index ee02153..ec5d67a 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -1417,7 +1417,8 @@ public function render($display_id = NULL) {
   /**
    * Gets the cache tags associated with the executed view.
    *
-   * Returns the view's cache tag plus the listed entity types' list cache tags.
+   * Note: The cache plugin controls the used tags, so you can override it, if
+   *   needed.
    *
    * @return string[]
    *   An array of cache tags.