diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
index 81a18c2..2c59f99 100644
--- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
@@ -25,7 +25,7 @@ class ConfigTranslationViewListUiTest extends UITestBase {
    */
   public static $modules = ['config_translation', 'views_ui'];
 
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
     $permissions = [
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
index 17a8673..c6e7977 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
@@ -43,7 +43,7 @@ class TaxonomyIndexTidUiTest extends UITestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
     $this->adminUser = $this->drupalCreateUser(['administer taxonomy', 'administer views']);
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyParentUITest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyParentUITest.php
index a57a09a..c2b5d5d 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyParentUITest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyParentUITest.php
@@ -3,7 +3,7 @@
 namespace Drupal\taxonomy\Tests\Views;
 
 use Drupal\views\Tests\ViewTestData;
-use Drupal\views_ui\Tests\UITestBase;
+use Drupal\Tests\views_ui\Functional\UITestBase;
 
 /**
  * Tests views taxonomy parent plugin UI.
diff --git a/core/modules/user/src/Tests/Views/AccessRoleUITest.php b/core/modules/user/src/Tests/Views/AccessRoleUITest.php
index cdda49d..483988c 100644
--- a/core/modules/user/src/Tests/Views/AccessRoleUITest.php
+++ b/core/modules/user/src/Tests/Views/AccessRoleUITest.php
@@ -30,7 +30,7 @@ class AccessRoleUITest extends UITestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
     ViewTestData::createTestViews(get_class($this), ['user_test_views']);
diff --git a/core/modules/views/tests/src/Functional/ViewTestBase.php b/core/modules/views/tests/src/Functional/ViewTestBase.php
index ba51aa2..54f7272 100644
--- a/core/modules/views/tests/src/Functional/ViewTestBase.php
+++ b/core/modules/views/tests/src/Functional/ViewTestBase.php
@@ -29,11 +29,10 @@
    */
   public static $modules = array('views', 'views_test_config');
 
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
-    if ($import_test_views) {
-      ViewTestData::createTestViews(get_class($this), array('views_test_config'));
-    }
+    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+
   }
 
   /**
diff --git a/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php b/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php
index e418c51..39076cd 100644
--- a/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php
+++ b/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php
@@ -173,7 +173,7 @@ public function testCustomOptionTemplate() {
       $this->{$values['test']}(strpos($output, $values['false']), SafeMarkup::format('Expected custom boolean FALSE value %value in output for %type', ['%value' => $values['false'], '%type' => $type]));
 
       // Assert that we are using the correct template.
-      $this->assertTrue(strpos($output, 'llama') !== FALSE);
+      $this->assertContains('llama', $output);
     }
   }
 
diff --git a/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
index 8a99749..70595f3 100644
--- a/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
@@ -20,7 +20,7 @@ class DefaultViewsTest extends UITestBase {
    */
   public static $testViews = ['test_view_status', 'test_page_display_menu', 'test_page_display_arguments'];
 
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
     $this->placeBlock('page_title_block');
@@ -41,7 +41,7 @@ public function testDefaultViews() {
     // Enable the view, and make sure it is now visible on the main listing
     // page.
     $this->drupalGet('admin/structure/views');
-    $this->clickViewsOperationLink('Enable', '/glossary/');
+    $this->clickViewsOperationLink(t('Enable'), '/glossary/');
     $this->assertUrl('admin/structure/views');
     $this->assertLinkByHref($edit_href);
 
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayFeedTest.php b/core/modules/views_ui/tests/src/Functional/DisplayFeedTest.php
index ce70428..e038539 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayFeedTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayFeedTest.php
@@ -59,7 +59,7 @@ protected function checkFeedViewUi($view_name) {
     foreach ($result as $item) {
       $input_node = $item->find('css', 'input');
       if ($input_node->hasAttribute('value')) {
-        $options[] = (string) $input_node->getAttribute('value');
+        $options[] = $input_node->getAttribute('value');
       }
     }
 
@@ -72,12 +72,12 @@ protected function checkFeedViewUi($view_name) {
     $this->assertNoRaw('<em>Page</em>');
 
     $this->drupalGet('admin/structure/views/view/' . $view_name . '/edit/feed_1');
-    $this->assertSession()->elementExists('xpath', '//*[@id="views-feed-1-displays"]');
+    $this->fieldValueEquals('views-feed-1-displays', '<em>Page</em>');
 
     // Add the default display, so there should now be multiple displays.
     $this->drupalPostForm('admin/structure/views/nojs/display/' . $view_name . '/feed_1/displays', ['displays[default]' => 'default'], t('Apply'));
     $this->drupalGet('admin/structure/views/view/' . $view_name . '/edit/feed_1');
-    $this->assertSession()->elementExists('xpath', '//*[@id="views-feed-1-displays"]');
+    $this->fieldValueEquals('views-feed-1-displays', 'Multiple displays');
   }
 
 }
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php b/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
index d824eb9..74b4d58 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
@@ -12,7 +12,7 @@
  */
 class DisplayPathTest extends UITestBase {
 
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
     $this->placeBlock('page_title_block');
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayTest.php b/core/modules/views_ui/tests/src/Functional/DisplayTest.php
index 0047961..ece573c 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayTest.php
@@ -285,15 +285,15 @@ public function testActionLinks() {
     $this->assertNoRaw($display_title);
 
     // Ensure that the dropdown buttons are displayed correctly.
-    $this->assertSession()->elementExists('xpath', '//input[@type="submit"]');
-    $this->assertSession()->elementExists('xpath', '//input[@type="submit"]');
-    $this->assertSession()->elementExists('xpath', '//input[@type="submit"]');
-    $this->assertSession()->elementNotExists('xpath', '//input[@type="submit"]');
+    $this->assertFieldByXpath('//input[@type="submit"]', 'Duplicate ' . $display_title);
+    $this->assertFieldByXpath('//input[@type="submit"]', 'Delete ' . $display_title);
+    $this->assertFieldByXpath('//input[@type="submit"]', 'Disable ' . $display_title);
+    $this->assertNoFieldByXpath('//input[@type="submit"]', 'Enable ' . $display_title);
 
     // Disable the display so we can test the rendering of the "Enable" button.
     $this->drupalPostForm(NULL, NULL, 'Disable ' . $display_title);
-    $this->assertSession()->elementExists('xpath', '//input[@type="submit"]');
-    $this->assertSession()->elementNotExists('xpath', '//input[@type="submit"]');
+    $this->assertFieldByXpath('//input[@type="submit"]', 'Enable ' . $display_title);
+    $this->assertNoFieldByXpath('//input[@type="submit"]', 'Disable ' . $display_title);
 
     // Ensure that the title is escaped as expected.
     $this->assertEscaped($display_title);
diff --git a/core/modules/views_ui/tests/src/Functional/DuplicateTest.php b/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
index f88b5f1..60a226a 100644
--- a/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
@@ -9,7 +9,7 @@
  */
 class DuplicateTest extends UITestBase {
 
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
     $this->placeBlock('page_title_block');
diff --git a/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php b/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
index 45a0040..26c0f1f 100644
--- a/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
+++ b/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
@@ -32,7 +32,7 @@ class ExposedFormUITest extends UITestBase {
    */
   protected $groupFormUiErrors = [];
 
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
     $this->drupalCreateContentType(['type' => 'article']);
diff --git a/core/modules/views_ui/tests/src/Functional/FieldUITest.php b/core/modules/views_ui/tests/src/Functional/FieldUITest.php
index 4256092..5bd5d43 100644
--- a/core/modules/views_ui/tests/src/Functional/FieldUITest.php
+++ b/core/modules/views_ui/tests/src/Functional/FieldUITest.php
@@ -59,7 +59,7 @@ public function testFieldUI() {
 
     // Ensure that dialog titles are not escaped.
     $edit_groupby_url = 'admin/structure/views/nojs/handler/test_view/default/field/name';
-    $this->assertNoLinkByHref($edit_groupby_url);
+    $this->assertNoLinkByHref($edit_groupby_url, 0, 'No aggregation link found.');
 
     // Enable aggregation on the view.
     $edit = [
@@ -67,7 +67,7 @@ public function testFieldUI() {
     ];
     $this->drupalPostForm('/admin/structure/views/nojs/display/test_view/default/group_by', $edit, t('Apply'));
 
-    $this->assertLinkByHref($edit_groupby_url);
+    $this->assertLinkByHref($edit_groupby_url, 0, 'Aggregation link found.');
 
     // @todo Get this test working under BrowserTestBase.
 //    $edit_handler_url = '/admin/structure/views/ajax/handler-group/test_view/default/field/name';
diff --git a/core/modules/views_ui/tests/src/Functional/HandlerTest.php b/core/modules/views_ui/tests/src/Functional/HandlerTest.php
index f8fe13c..6b466f6 100644
--- a/core/modules/views_ui/tests/src/Functional/HandlerTest.php
+++ b/core/modules/views_ui/tests/src/Functional/HandlerTest.php
@@ -31,7 +31,7 @@ class HandlerTest extends UITestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
     $this->placeBlock('page_title_block');
diff --git a/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php b/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
index 174b149..03a2d47 100644
--- a/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
+++ b/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
@@ -9,10 +9,10 @@
  */
 class OverrideDisplaysTest extends UITestBase {
 
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
-    $this->placeBlock('page_title_block');
+    $this->drupalPlaceBlock('page_title_block');
   }
 
   /**
diff --git a/core/modules/views_ui/tests/src/Functional/SettingsTest.php b/core/modules/views_ui/tests/src/Functional/SettingsTest.php
index 6d62246..f32c2d6 100644
--- a/core/modules/views_ui/tests/src/Functional/SettingsTest.php
+++ b/core/modules/views_ui/tests/src/Functional/SettingsTest.php
@@ -19,7 +19,7 @@ class SettingsTest extends UITestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
     $this->drupalPlaceBlock('local_tasks_block');
   }
diff --git a/core/modules/views_ui/tests/src/Functional/UITestBase.php b/core/modules/views_ui/tests/src/Functional/UITestBase.php
index 5c53fe7..6814281 100644
--- a/core/modules/views_ui/tests/src/Functional/UITestBase.php
+++ b/core/modules/views_ui/tests/src/Functional/UITestBase.php
@@ -33,7 +33,7 @@
   /**
    * {@inheritdoc}
    */
-  protected function setUp($import_test_views = TRUE) {
+  protected function setUp() {
     parent::setUp();
 
     $this->enableViewsTestModule();