diff --git a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
index 92495a5..61403db 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
@@ -22,7 +22,6 @@
 use Drupal\search\Plugin\SearchIndexingInterface;
 use Drupal\Search\SearchQuery;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
  * Handles searching for node entities using the Search module index.
diff --git a/core/modules/search/lib/Drupal/search/Form/SearchBlockForm.php b/core/modules/search/lib/Drupal/search/Form/SearchBlockForm.php
index 748ec43..dafe312 100644
--- a/core/modules/search/lib/Drupal/search/Form/SearchBlockForm.php
+++ b/core/modules/search/lib/Drupal/search/Form/SearchBlockForm.php
@@ -10,8 +10,6 @@
 use Drupal\Core\Form\FormBase;
 use Drupal\search\SearchPageRepositoryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Builds the search form for the search block.
diff --git a/core/modules/search/lib/Drupal/search/Form/SearchPageForm.php b/core/modules/search/lib/Drupal/search/Form/SearchPageForm.php
index 7814570..6f6e70a 100644
--- a/core/modules/search/lib/Drupal/search/Form/SearchPageForm.php
+++ b/core/modules/search/lib/Drupal/search/Form/SearchPageForm.php
@@ -8,8 +8,6 @@
 namespace Drupal\search\Form;
 
 use Drupal\Core\Entity\EntityFormController;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Provides a search form for site wide search.
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php b/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php
index 94726e0..0c7f541 100644
--- a/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php
+++ b/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php
@@ -187,12 +187,12 @@ function testSearchModuleDisabling() {
     $this->drupalGet('admin/config/search/pages/manage/node_search/set-default');
 
     $paths = array(
-      'search/node' => array('query' => array('keys' => 'pizza')),
-      'search/node' => array(),
+      array('path' => 'search/node', 'options' => array('query' => array('keys' => 'pizza'))),
+      array('path' => 'search/node', 'options' => array()),
     );
 
-    foreach ($paths as $path => $options) {
-      $this->drupalGet($path, $options);
+    foreach ($paths as $item) {
+      $this->drupalGet($item['path'], $item['options']);
       foreach ($plugins as $entity_id) {
         $label = $entities[$entity_id]->label();
         $this->assertText($label, format_string('%label search tab is shown', array('%label' => $label)));