diff -u b/core/modules/views_ui/tests/src/Functional/UITestBase.php b/core/modules/views_ui/src/Tests/UITestBase.php
--- b/core/modules/views_ui/tests/src/Functional/UITestBase.php
+++ b/core/modules/views_ui/src/Tests/UITestBase.php
@@ -1,11 +1,16 @@
 <?php
 
-namespace Drupal\Tests\views_ui\Functional;
+namespace Drupal\views_ui\Tests;
 
-use Drupal\Tests\views\Functional\ViewTestBase;
+@trigger_error('\Drupal\views_ui\Tests\UITestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.x. Instead, use \Drupal\Tests\views_ui\Functional\UITestBase', E_USER_DEPRECATED);
+
+use Drupal\views\Tests\ViewTestBase;
 
 /**
  * Provides a base class for testing the Views UI.
+ *
+ * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.x.
+ *   Use \Drupal\Tests\views_ui\Functional\UITestBase.
  */
 abstract class UITestBase extends ViewTestBase {
 
@@ -33,8 +38,8 @@
   /**
    * {@inheritdoc}
    */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
+  protected function setUp() {
+    parent::setUp();
 
     $this->enableViewsTestModule();
 
@@ -78,9 +83,9 @@
     // Ensure that each nojs page is accessible via ajax as well.
     if (strpos($url, 'nojs') !== FALSE) {
       $url = str_replace('nojs', 'ajax', $url);
-      $result = $this->drupalGet($url, $options);
-      $this->assertSession()->statusCodeEquals(200);
-      $this->assertEquals('application/json', $this->getSession()->getResponseHeader('Content-Type'));
+      $result = $this->drupalGet($url, $options, $headers);
+      $this->assertResponse(200);
+      $this->assertHeader('Content-Type', 'application/json');
       $this->assertTrue(json_decode($result), 'Ensure that the AJAX request returned valid content.');
     }
 
only in patch2:
unchanged:
--- a/core/modules/views_ui/src/Tests/WizardTest.php
+++ b/core/modules/views_ui/tests/src/Functional/WizardTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\views_ui\Tests;
+namespace Drupal\Tests\views_ui\Functional;
 
-use Drupal\views\Tests\Wizard\WizardTestBase;
+use Drupal\Tests\views\Functional\Wizard\WizardTestBase;
 
 /**
  * Tests the wizard.