diff --git a/core/modules/views/src/Tests/Handler/HandlerTestBase.php b/core/modules/views/src/Tests/Handler/HandlerTestBase.php
index c2afcbc..1603329 100644
--- a/core/modules/views/src/Tests/Handler/HandlerTestBase.php
+++ b/core/modules/views/src/Tests/Handler/HandlerTestBase.php
@@ -1,13 +1,13 @@
 <?php
 
 namespace Drupal\views\Tests\Handler;
-@trigger_error('\Drupal\views\Tests\Handler\HandlerTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\Handler\HandlerTestBase', E_USER_DEPRECATED);
+@trigger_error('\Drupal\views\Tests\Handler\HandlerTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\ViewTestBase', E_USER_DEPRECATED);
 
 use Drupal\views\Tests\ViewTestBase;
 
 /**
  * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
- *   Use \Drupal\Tests\views\Functional\Handler\HandlerTestBase.
+ *   Use \Drupal\Tests\views\Functional\ViewTestBase.
  */
 abstract class HandlerTestBase extends ViewTestBase {
 
diff --git a/core/modules/views/src/Tests/Plugin/PluginTestBase.php b/core/modules/views/src/Tests/Plugin/PluginTestBase.php
index 5322704..c386181 100644
--- a/core/modules/views/src/Tests/Plugin/PluginTestBase.php
+++ b/core/modules/views/src/Tests/Plugin/PluginTestBase.php
@@ -1,13 +1,13 @@
 <?php
 
 namespace Drupal\views\Tests\Plugin;
-@trigger_error('\Drupal\views\Tests\Plugin\PluginTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\Plugin\PluginTestBase', E_USER_DEPRECATED);
+@trigger_error('\Drupal\views\Tests\Plugin\PluginTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\views\Functional\ViewTestBase', E_USER_DEPRECATED);
 
 use Drupal\views\Tests\ViewTestBase;
 
 /**
  * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
- *   Use \Drupal\Tests\views\Functional\Plugin\PluginTestBase.
+ *   Use \Drupal\Tests\views\Functional\ViewTestBase.
  */
 abstract class PluginTestBase extends ViewTestBase {
 
diff --git a/core/modules/views/tests/src/Functional/Handler/AreaHTTPStatusCodeTest.php b/core/modules/views/tests/src/Functional/Handler/AreaHTTPStatusCodeTest.php
index 0e1cca9..dc914ce 100644
--- a/core/modules/views/tests/src/Functional/Handler/AreaHTTPStatusCodeTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/AreaHTTPStatusCodeTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Handler;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 
 /**
@@ -10,7 +11,7 @@
  * @group views
  * @see \Drupal\views\Plugin\views\area\HTTPStatusCode
  */
-class AreaHTTPStatusCodeTest extends HandlerTestBase {
+class AreaHTTPStatusCodeTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Handler/AreaTest.php b/core/modules/views/tests/src/Functional/Handler/AreaTest.php
index 7e3e575..d631373 100644
--- a/core/modules/views/tests/src/Functional/Handler/AreaTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/AreaTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\views\Functional\Handler;
 
 use Drupal\Component\Utility\Xss;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 
 /**
@@ -12,7 +13,7 @@
  * @see \Drupal\views\Plugin\views\area\AreaPluginBase
  * @see \Drupal\views_test\Plugin\views\area\TestExample
  */
-class AreaTest extends HandlerTestBase {
+class AreaTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Handler/AreaTitleWebTest.php b/core/modules/views/tests/src/Functional/Handler/AreaTitleWebTest.php
index db53771..9e1fcfa 100644
--- a/core/modules/views/tests/src/Functional/Handler/AreaTitleWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/AreaTitleWebTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Handler;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Entity\View;
 
 /**
@@ -10,7 +11,7 @@
  * @group views
  * @see \Drupal\views\Plugin\views\area\Title
  */
-class AreaTitleWebTest extends HandlerTestBase {
+class AreaTitleWebTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Handler/ArgumentStringTest.php b/core/modules/views/tests/src/Functional/Handler/ArgumentStringTest.php
index 659e527..17ece94 100644
--- a/core/modules/views/tests/src/Functional/Handler/ArgumentStringTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/ArgumentStringTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Handler;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 
 /**
@@ -9,7 +10,7 @@
  *
  * @group views
  */
-class ArgumentStringTest extends HandlerTestBase {
+class ArgumentStringTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php b/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
index 35f2a3e..e0e380b 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
@@ -2,13 +2,15 @@
 
 namespace Drupal\Tests\views\Functional\Handler;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
+
 /**
  * Tests the dropbutton field handler.
  *
  * @group views
  * @see \Drupal\system\Plugin\views\field\Dropbutton
  */
-class FieldDropButtonTest extends HandlerTestBase {
+class FieldDropButtonTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php b/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
index a0b8827..653ce11 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
@@ -5,13 +5,14 @@
 use Drupal\Core\Url;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Entity\Node;
+use Drupal\Tests\views\Functional\ViewTestBase;
 
 /**
  * Tests the core Drupal\views\Plugin\views\field\EntityOperations handler.
  *
  * @group views
  */
-class FieldEntityOperationsTest extends HandlerTestBase {
+class FieldEntityOperationsTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsTest.php b/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsTest.php
index fb9e405..d38ba41 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsTest.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Render\RenderContext;
 use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\field\Entity\FieldStorageConfig;
 
@@ -15,7 +16,7 @@
  *
  * @group views
  */
-class FieldGroupRowsTest extends HandlerTestBase {
+class FieldGroupRowsTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsWebTest.php b/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsWebTest.php
index 08f701d..275960c 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsWebTest.php
@@ -5,13 +5,14 @@
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\views\Functional\ViewTestBase;
 
 /**
  * Tests the "Display all values in the same row" setting.
  *
  * @group views
  */
-class FieldGroupRowsWebTest extends HandlerTestBase {
+class FieldGroupRowsWebTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
index ceb73c4..318be3f 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
@@ -8,6 +8,7 @@
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Url;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 
 /**
@@ -16,7 +17,7 @@
  * @group views
  * @see \Drupal\views\Plugin\views\field\FieldPluginBase
  */
-class FieldWebTest extends HandlerTestBase {
+class FieldWebTest extends ViewTestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
diff --git a/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php b/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
index 5ad85cc..ec3b523 100644
--- a/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
@@ -6,6 +6,7 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\NodeType;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 
 /**
@@ -13,7 +14,7 @@
  *
  * @group views
  */
-class FilterDateTest extends HandlerTestBase {
+class FilterDateTest extends ViewTestBase {
   use SchemaCheckTestTrait;
 
   /**
@@ -227,18 +228,18 @@ protected function _testFilterDateUI() {
     $this->drupalPostForm(NULL, [], t('Save'));
 
     $this->drupalGet($path);
-    $this->drupalPostForm(NULL, [], t('Apply'));
+    $this->drupalPostForm(NULL, [], 'Apply');
     $results = $this->cssSelect('.view-content .field-content');
     $this->assertEqual(count($results), 4);
-    $this->drupalPostForm(NULL, ['created' => '1'], t('Apply'));
+    $this->drupalPostForm(NULL, ['created' => '1'], 'Apply');
     $results = $this->cssSelect('.view-content .field-content');
     $this->assertEqual(count($results), 1);
     $this->assertEqual($results[0]->getText(), $this->nodes[3]->id());
-    $this->drupalPostForm(NULL, ['created' => '2'], t('Apply'));
+    $this->drupalPostForm(NULL, ['created' => '2'], 'Apply');
     $results = $this->cssSelect('.view-content .field-content');
     $this->assertEqual(count($results), 1);
     $this->assertEqual($results[0]->getText(), $this->nodes[3]->id());
-    $this->drupalPostForm(NULL, ['created' => '3'], t('Apply'));
+    $this->drupalPostForm(NULL, ['created' => '3'], 'Apply');
     $results = $this->cssSelect('.view-content .field-content');
     $this->assertEqual(count($results), 1);
     $this->assertEqual($results[0]->getText(), $this->nodes[1]->id());
@@ -259,7 +260,7 @@ protected function _testFilterDateUI() {
     $results = $this->cssSelect('.view-content .field-content');
     $this->assertEqual(count($results), 1);
     $this->assertEqual($results[0]->getText(), $this->nodes[3]->id());
-    $this->drupalPostForm(NULL, ['created' => format_date(250000, 'custom', 'Y-m-d H:i:s')], t('Apply'));
+    $this->drupalPostForm(NULL, ['created' => format_date(250000, 'custom', 'Y-m-d H:i:s')], 'Apply');
     $results = $this->cssSelect('.view-content .field-content');
     $this->assertEqual(count($results), 2);
     $this->assertEqual($results[0]->getText(), $this->nodes[2]->id());
diff --git a/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php b/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
index 77f5754..1a37ce8 100644
--- a/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\views\Functional\Handler;
 
 use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\views\Plugin\views\filter\InOperator;
@@ -13,7 +14,7 @@
  *
  * @group views
  */
-class HandlerAllTest extends HandlerTestBase {
+class HandlerAllTest extends ViewTestBase {
 
   use CommentTestTrait;
 
diff --git a/core/modules/views/tests/src/Functional/Handler/HandlerTest.php b/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
index eed5773..2b4f59c 100644
--- a/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\views\Functional\Handler;
 
 use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Entity\View;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\HandlerBase;
@@ -13,7 +14,7 @@
  *
  * @group views
  */
-class HandlerTest extends HandlerTestBase {
+class HandlerTest extends ViewTestBase {
 
   use CommentTestTrait;
 
@@ -259,8 +260,7 @@ public function testRelationshipUI() {
     $this->assertFieldByName($relationship_name);
 
     // Check for available options.
-    $xpath = $this->buildXPathQuery('//textarea[@name=:value]|//input[@name=:value]|//select[@name=:value]', [':value' => $relationship_name]);
-    $fields = $this->xpath($xpath);
+    $fields = $this->getSession()->getPage()->findAll('named', ['field', $relationship_name]);
     $options = [];
     foreach ($fields as $field) {
       $items = $field->findAll('css', 'option');
diff --git a/core/modules/views/tests/src/Functional/Handler/HandlerTestBase.php b/core/modules/views/tests/src/Functional/Handler/HandlerTestBase.php
deleted file mode 100644
index e4a7736..0000000
--- a/core/modules/views/tests/src/Functional/Handler/HandlerTestBase.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Drupal\Tests\views\Functional\Handler;
-
-use Drupal\Tests\views\Functional\ViewTestBase;
-
-/**
- * Views handler test base.
- */
-abstract class HandlerTestBase extends ViewTestBase {
-
-}
diff --git a/core/modules/views/tests/src/Functional/Plugin/AccessTest.php b/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
index eca4862..41aa6ec 100644
--- a/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Views;
 
@@ -12,7 +13,7 @@
  * @todo It probably make sense to split the test up by one for role/perm/none
  *   and the two generic ones.
  */
-class AccessTest extends PluginTestBase {
+class AccessTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
index 5c7b3a3..b3956de 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Url;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\views_test_data\Plugin\views\argument_default\ArgumentDefaultTest as ArgumentDefaultTestPlugin;
 use Symfony\Component\HttpFoundation\Request;
@@ -15,7 +16,7 @@
  *
  * @group views
  */
-class ArgumentDefaultTest extends PluginTestBase {
+class ArgumentDefaultTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php b/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php
index 044b8fd..1d78204 100644
--- a/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\views\Functional\Plugin;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Views;
 
@@ -12,7 +13,7 @@
  * @group views
  * @see \Drupal\views\Plugin\views\cache\Tag
  */
-class CacheTagTest extends PluginTestBase {
+class CacheTagTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php b/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php
index 1549ca6..40bf601 100644
--- a/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\views\Functional\Plugin;
 
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Views;
 
@@ -12,7 +13,7 @@
  * @group views
  * @see views_plugin_cache
  */
-class CacheWebTest extends PluginTestBase {
+class CacheWebTest extends ViewTestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
diff --git a/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php b/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
index c4fbd34..567e1c9 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\views\Functional\Plugin;
 
 use Drupal\Core\Plugin\Context\ContextDefinitionInterface;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 
@@ -11,7 +12,7 @@
  *
  * @group views
  */
-class ContextualFiltersBlockContextTest extends PluginTestBase {
+class ContextualFiltersBlockContextTest extends ViewTestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php b/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
index 1a6612b..708ac55 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
@@ -2,13 +2,15 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
+
 /**
  * Tests the ability to disable and enable view displays.
  *
  * @group views
  * @see \Drupal\views\Plugin\views\display\Feed
  */
-class DisabledDisplayTest extends PluginTestBase {
+class DisabledDisplayTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
index a25cd39..8c326ba 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 
 /**
@@ -10,7 +11,7 @@
  * @group views
  * @see \Drupal\views\Plugin\views\display\Attachment
  */
-class DisplayAttachmentTest extends PluginTestBase {
+class DisplayAttachmentTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
index 2528192..a081ad7 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
@@ -6,6 +6,7 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 
 /**
@@ -15,7 +16,7 @@
  *
  * @see \Drupal\views\Plugin\views\display\EntityReference
  */
-class DisplayEntityReferenceTest extends PluginTestBase {
+class DisplayEntityReferenceTest extends ViewTestBase {
 
   use EntityReferenceTestTrait;
 
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
index 101a584..3d2aca6 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\views\Functional\Plugin;
 
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 
 /**
@@ -10,7 +11,7 @@
  *
  * @group views
  */
-class DisplayPageWebTest extends PluginTestBase {
+class DisplayPageWebTest extends ViewTestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
index 927cdda..d5fb6d0 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\views\Functional\Plugin;
 
 use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\views_test_data\Plugin\views\display\DisplayTest as DisplayTestPlugin;
 
@@ -11,7 +12,7 @@
  *
  * @group views
  */
-class DisplayTest extends PluginTestBase {
+class DisplayTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php b/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
index 36b9984..ed5b0e5 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
@@ -14,7 +14,7 @@
  *
  * @group views
  */
-class ExposedFormTest extends PluginTestBase {
+class ExposedFormTest extends ViewTestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
diff --git a/core/modules/views/tests/src/Functional/Plugin/FilterTest.php b/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
index 2f13e7e..6042410 100644
--- a/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\views_test_data\Plugin\views\filter\FilterTest as FilterPlugin;
 
@@ -11,7 +12,7 @@
  * @group views
  * @see \Drupal\views\Plugin\views\filter\FilterPluginBase
  */
-class FilterTest extends PluginTestBase {
+class FilterTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php b/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
index 95d17e1..8afbb57 100644
--- a/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
@@ -3,13 +3,14 @@
 namespace Drupal\Tests\views\Functional\Plugin;
 
 use Drupal\menu_link_content\Entity\MenuLinkContent;
+use Drupal\Tests\views\Functional\ViewTestBase;
 
 /**
  * Tests the menu links created in views.
  *
  * @group views
  */
-class MenuLinkTest extends PluginTestBase {
+class MenuLinkTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php b/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php
index 31f18e3..492d22f 100644
--- a/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 
 /**
@@ -10,7 +11,7 @@
  * @group views
  * @see \Drupal\views\Plugin\views\pager\Mini
  */
-class MiniPagerTest extends PluginTestBase {
+class MiniPagerTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php b/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
index 82e726c..08f2504 100644
--- a/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
@@ -4,13 +4,14 @@
 
 use Drupal\Component\Gettext\PoHeader;
 use Drupal\file\Entity\File;
+use Drupal\Tests\views\Functional\ViewTestBase;
 
 /**
  * Tests the creation of numeric fields.
  *
  * @group field
  */
-class NumericFormatPluralTest extends PluginTestBase {
+class NumericFormatPluralTest extends ViewTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/views/tests/src/Functional/Plugin/PagerTest.php b/core/modules/views/tests/src/Functional/Plugin/PagerTest.php
index c8535ae..eda8891 100644
--- a/core/modules/views/tests/src/Functional/Plugin/PagerTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/PagerTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\views\Functional\Plugin;
 
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\language\Entity\ConfigurableLanguage;
 
@@ -11,7 +12,7 @@
  *
  * @group views
  */
-class PagerTest extends PluginTestBase {
+class PagerTest extends ViewTestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
diff --git a/core/modules/views/tests/src/Functional/Plugin/PluginTestBase.php b/core/modules/views/tests/src/Functional/Plugin/PluginTestBase.php
deleted file mode 100644
index 211e9bb..0000000
--- a/core/modules/views/tests/src/Functional/Plugin/PluginTestBase.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Drupal\Tests\views\Functional\Plugin;
-
-use Drupal\Tests\views\Functional\ViewTestBase;
-
-/**
- * Views plugin test base.
- */
-abstract class PluginTestBase extends ViewTestBase {
-
-}
diff --git a/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php b/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
index 3f6710c..252a309 100644
--- a/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
@@ -3,13 +3,14 @@
 namespace Drupal\Tests\views\Functional\Plugin;
 
 use Drupal\entity_test\Entity\EntityTest;
+use Drupal\Tests\views\Functional\ViewTestBase;
 
 /**
  * Tests the summary style plugin.
  *
  * @group views
  */
-class StyleSummaryTest extends PluginTestBase {
+class StyleSummaryTest extends ViewTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php b/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
index d77facf..3bbe6bf 100644
--- a/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Entity\View;
 
 /**
@@ -9,7 +10,7 @@
  *
  * @group views
  */
-class StyleTableTest extends PluginTestBase {
+class StyleTableTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/StyleTest.php b/core/modules/views/tests/src/Functional/Plugin/StyleTest.php
index 5d6ef22..fbb5bcf 100644
--- a/core/modules/views/tests/src/Functional/Plugin/StyleTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/StyleTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\views_test_data\Plugin\views\row\RowTest;
 use Drupal\views\Plugin\views\row\Fields;
@@ -14,7 +15,7 @@
  * @group views
  * @see \Drupal\views_test_data\Plugin\views\style\StyleTest.
  */
-class StyleTest extends PluginTestBase {
+class StyleTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
index 1790be6..0ca6f87 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
@@ -2,12 +2,14 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
+
 /**
  * Tests views bulk operation selection.
  *
  * @group views
  */
-class ViewsBulkTest extends PluginTestBase {
+class ViewsBulkTest extends ViewTestBase {
 
   /**
    * An admin user
diff --git a/core/modules/views/tests/src/Functional/Plugin/ViewsFormTest.php b/core/modules/views/tests/src/Functional/Plugin/ViewsFormTest.php
index d953099..3f6e1ec 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ViewsFormTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ViewsFormTest.php
@@ -2,12 +2,14 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
+
 /**
  * Tests Views forms functionality.
  *
  * @group views
  */
-class ViewsFormTest extends PluginTestBase {
+class ViewsFormTest extends ViewTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/views/tests/src/Functional/Plugin/ViewsSqlExceptionTest.php b/core/modules/views/tests/src/Functional/Plugin/ViewsSqlExceptionTest.php
index c3ab744..40405ae 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ViewsSqlExceptionTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ViewsSqlExceptionTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
 
@@ -10,7 +11,7 @@
  *
  * @group views
  */
-class ViewsSqlExceptionTest extends PluginTestBase {
+class ViewsSqlExceptionTest extends ViewTestBase {
 
   /**
    * Views used by this test.
diff --git a/core/modules/views/tests/src/Functional/Wizard/BasicTest.php b/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
index 27dc2c7..eb2ddbb 100644
--- a/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
+++ b/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
@@ -80,7 +80,9 @@ public function testViewsWizardAndListing() {
     $elements = $this->cssSelect('link[href="' . Url::fromRoute('view.' . $view2['id'] . '.feed_1', [], ['absolute' => TRUE])->toString() . '"]');
     $this->assertEqual(count($elements), 1, 'Feed found.');
     $this->drupalGet($view2['page[feed_properties][path]']);
-    $this->assertEmpty($this->cssSelect('rss[version="2.0"]'));
+    // Because the response is XML we can't use the page which depends on an
+    // HTML tag being present.
+    $this->assertEquals('2.0', $this->getSession()->getDriver()->getAttribute('//rss', 'version'));
     // The feed should have the same title and nodes as the page.
     $this->assertText($view2['page[title]']);
     $this->assertRaw($node1->url('canonical', ['absolute' => TRUE]));
diff --git a/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php b/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
index 99f7b8a..3232ecb 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
@@ -157,9 +157,6 @@ public function testReadMore() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
 
-    if (!isset($this->options['validate']['type'])) {
-      return;
-    }
     $expected_more_text = 'custom more text';
 
     $view = Views::getView('test_display_more');
@@ -169,7 +166,7 @@ public function testReadMore() {
     $output = $renderer->renderRoot($output);
 
     $this->setRawContent($output);
-    $result = $this->xpath('//a[@class=:class]', [':class' => 'more-link']);
+    $result = $this->xpath('//div[@class=:class]/a', [':class' => 'more-link']);
     $this->assertEqual($result[0]->attributes()->href, \Drupal::url('view.test_display_more.page_1'), 'The right more link is shown.');
     $this->assertEqual(trim($result[0][0]), $expected_more_text, 'The right link text is shown.');
 
@@ -178,7 +175,7 @@ public function testReadMore() {
     $more_link = $view->display_handler->renderMoreLink();
     $more_link = $renderer->renderRoot($more_link);
     $this->setRawContent($more_link);
-    $result = $this->xpath('//a[@class=:class]', [':class' => 'more-link']);
+    $result = $this->xpath('//div[@class=:class]/a', [':class' => 'more-link']);
     $this->assertEqual($result[0]->attributes()->href, \Drupal::url('view.test_display_more.page_1'), 'The right more link is shown.');
     $this->assertEqual(trim($result[0][0]), $expected_more_text, 'The right link text is shown.');
 
@@ -194,7 +191,7 @@ public function testReadMore() {
     $output = $view->preview();
     $output = $renderer->renderRoot($output);
     $this->setRawContent($output);
-    $result = $this->xpath('//a[@class=:class]', [':class' => 'more-link']);
+    $result = $this->xpath('//div[@class=:class]/a', [':class' => 'more-link']);
     $this->assertTrue(empty($result), 'The more link is not shown.');
 
     $view = Views::getView('test_display_more');
@@ -212,7 +209,7 @@ public function testReadMore() {
     $output = $view->preview();
     $output = $renderer->renderRoot($output);
     $this->setRawContent($output);
-    $result = $this->xpath('//a[@class=:class]', [':class' => 'more-link']);
+    $result = $this->xpath('//div[@class=:class]/a', [':class' => 'more-link']);
     $this->assertTrue(empty($result), 'The more link is not shown when view has more records.');
 
     // Test the default value of use_more_always.