diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php
index f80f92e..aec3355 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php
@@ -9,6 +9,7 @@
 
 use Symfony\Component\Routing\RequestContext;
 use Drupal\simpletest\WebTestBase;
+use Drupal\Core\Cache\Cache;
 
 /**
  * Enables the page cache and tests it with various HTTP requests.
@@ -42,7 +43,7 @@ function setUp() {
   }
 
   /**
-   * Assure that cache tags are properly persisted.
+   * Test that cache tags are properly persisted.
    *
    * Since tag based invalidation works, we know that our tag properly
    * persisted.
@@ -59,7 +60,7 @@ function testPageCacheTags() {
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
     $this->drupalGet($path);
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
-    cache_invalidate_tags($tags);
+    Cache::invalidateTags($tags);
     $this->drupalGet($path);
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
   }
diff --git a/core/modules/system/tests/modules/test_page_test/test_page_test.module b/core/modules/system/tests/modules/test_page_test/test_page_test.module
index 4fab773..5911afb 100644
--- a/core/modules/system/tests/modules/test_page_test/test_page_test.module
+++ b/core/modules/system/tests/modules/test_page_test/test_page_test.module
@@ -22,6 +22,5 @@ function test_page_test_page() {
   return array(
     '#title' => t('Test page'),
     '#markup' => t('Test page text.'),
-    '#cache' => array('tags' => array('test-page' => TRUE)),
   );
 }