diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php b/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php
index 97030a6..ee272bc 100644
--- a/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php
+++ b/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php
@@ -271,42 +271,41 @@ public function testMultipleSearchPages() {
     $this->assertIdentical((string) $elements[1]['href'], url('search/' . $first['path']));
 
     // Check the initial state of the search pages.
-    $this->drupalGet('admin/config/search/settings');
-    $this->verifySearchPageOperations($first_id, TRUE, FALSE, FALSE, FALSE);
-    $this->verifySearchPageOperations($second_id, TRUE, TRUE, TRUE, FALSE);
+    $this->verifySearchPageOperations($first, TRUE, FALSE, FALSE, FALSE, TRUE);
+    $this->verifySearchPageOperations($second, TRUE, TRUE, TRUE, FALSE, TRUE);
 
     // Change the default search page.
     $this->clickLink(t('Set as default'));
     $this->assertRaw(t('The default search page is now %label. Be sure to check the ordering of your search pages.', array('%label' => $second['label'])));
-    $this->verifySearchPageOperations($first_id, TRUE, TRUE, TRUE, FALSE);
-    $this->verifySearchPageOperations($second_id, TRUE, FALSE, FALSE, FALSE);
+    $this->verifySearchPageOperations($first, TRUE, TRUE, TRUE, FALSE, TRUE);
+    $this->verifySearchPageOperations($second, TRUE, FALSE, FALSE, FALSE, TRUE);
 
     // Disable the first search page.
     $this->clickLink(t('Disable'));
     $this->assertResponse(200);
     $this->assertNoLink(t('Disable'));
-    $this->verifySearchPageOperations($first_id, TRUE, TRUE, FALSE, TRUE);
-    $this->verifySearchPageOperations($second_id, TRUE, FALSE, FALSE, FALSE);
+    $this->verifySearchPageOperations($first, TRUE, TRUE, FALSE, TRUE, FALSE);
+    $this->verifySearchPageOperations($second, TRUE, FALSE, FALSE, FALSE, TRUE);
 
     // Enable the first search page.
     $this->clickLink(t('Enable'));
     $this->assertResponse(200);
-    $this->verifySearchPageOperations($first_id, TRUE, TRUE, TRUE, FALSE);
-    $this->verifySearchPageOperations($second_id, TRUE, FALSE, FALSE, FALSE);
+    $this->verifySearchPageOperations($first, TRUE, TRUE, TRUE, FALSE, TRUE);
+    $this->verifySearchPageOperations($second, TRUE, FALSE, FALSE, FALSE, TRUE);
 
     // Test deleting.
     $this->clickLink(t('Delete'));
     $this->assertRaw(t('Are you sure you want to delete the %label search page?', array('%label' => $first['label'])));
     $this->drupalPostForm(NULL, array(), t('Delete'));
     $this->assertRaw(t('The %label search page has been deleted.', array('%label' => $first['label'])));
-    $this->verifySearchPageOperations($first_id, FALSE, FALSE, FALSE, FALSE);
+    $this->verifySearchPageOperations($first, FALSE, FALSE, FALSE, FALSE, FALSE);
   }
 
   /**
    * Checks that the search page operations match expectations.
    *
-   * @param string $id
-   *   The search page ID to check.
+   * @param array $info
+   *   The information about the search page ID.
    * @param bool $edit
    *   Whether the edit link is expected.
    * @param bool $delete
@@ -315,8 +314,16 @@ public function testMultipleSearchPages() {
    *   Whether the disable link is expected.
    * @param bool $enable
    *   Whether the enable link is expected.
+   * @param bool $is_active
+   *   Whether the page is active or not.
    */
-  protected function verifySearchPageOperations($id, $edit, $delete, $disable, $enable) {
+  protected function verifySearchPageOperations($info, $edit, $delete, $disable, $enable, $is_active) {
+    $this->drupalGet($info['path']);
+    $this->assertResponse($is_active ? 200 : 404);
+
+    $id = $info['id'];
+    $this->drupalGet('admin/config/search/settings');
+
     if ($edit) {
       $this->assertLinkByHref("admin/config/search/settings/manage/$id");
     }