diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php
index bcfbfcd..744b23b 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php
@@ -28,7 +28,7 @@ function setUp() {
     // correctly.
     user_role_revoke_permissions(DRUPAL_AUTHENTICATED_RID, array('view own unpublished content'));
 
-    $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'access content overview', 'administer nodes', 'bypass node access'));
+    $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'access content overview', 'administer nodes', 'bypass node access', 'administer content types'));
     $this->base_user_1 = $this->drupalCreateUser(array('access content overview'));
     $this->base_user_2 = $this->drupalCreateUser(array('access content overview', 'view own unpublished content'));
     $this->base_user_3 = $this->drupalCreateUser(array('access content overview', 'bypass node access'));
@@ -171,5 +171,25 @@ function testContentAdminPages() {
       $this->assertLinkByHref('node/' . $node->nid . '/edit');
       $this->assertLinkByHref('node/' . $node->nid . '/delete');
     }
+
+    // Verify that the values in $_SESSION['node_overview_filter'] are valid.
+    $this->drupalLogout();
+    $this->drupalLogin($this->admin_user);
+    $this->drupalGet('admin/content');
+    $edit = array(
+      'type' => 'page',
+    );
+    $this->drupalPost(NULL, $edit, t('Filter'));
+    $this->assertRaw(t('where %property is %value', array('%property' => t('type'), '%value' => 'Basic page')), t('Content list is filtered by content type.'));
+
+    // Remove the page nodes and the content type.
+    node_delete($nodes['published_page']->nid);
+    node_delete($nodes['unpublished_page_1']->nid);
+    node_delete($nodes['unpublished_page_2']->nid);
+    $this->drupalPost('admin/structure/types/manage/page/delete', array(), t('Delete'));
+
+    // Verify the filter is gone.
+    $this->drupalGet('admin/content');
+    $this->assertNoRaw(t('where %property is', array('%property' => t('type'))), t('Content type filter has been removed.'));
   }
 }