diff --git a/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php b/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
index db665c9e45..3ea2dba06c 100644
--- a/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
+++ b/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\block_content\Tests\Views;
 
+@trigger_error('\Drupal\block_content\Tests\Views\BlockContentTestBase is deprecated in 8.4.0 and will be removed before Drupal 9.0.0. Use \Drupal\Tests\block_content\Functional\Views\BlockContentTestBase.', E_USER_DEPRECATED);
+
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Utility\SafeMarkup;
@@ -10,6 +12,9 @@
 
 /**
  * Base class for all block_content tests.
+ *
+ * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Tests\block_content\Functional\Views\BlockContentTestBase.
  */
 abstract class BlockContentTestBase extends ViewTestBase {
 
diff --git a/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php b/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
similarity index 95%
rename from core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php
rename to core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
index 1ff4fb55ba..a016ab9141 100644
--- a/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php
+++ b/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests\Views;
+namespace Drupal\Tests\block_content\Functional\Views;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -35,8 +35,8 @@ class BlockContentFieldFilterTest extends BlockContentTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
-    parent::setUp();
+  public function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
 
     // Add two new languages.
     ConfigurableLanguage::createFromLangcode('fr')->save();
diff --git a/core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php b/core/modules/block_content/tests/src/Functional/Views/BlockContentIntegrationTest.php
similarity index 95%
rename from core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php
rename to core/modules/block_content/tests/src/Functional/Views/BlockContentIntegrationTest.php
index 8ec17e2381..93661578bd 100644
--- a/core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php
+++ b/core/modules/block_content/tests/src/Functional/Views/BlockContentIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests\Views;
+namespace Drupal\Tests\block_content\Functional\Views;
 
 /**
  * Tests the block_content integration into views.
@@ -59,7 +59,7 @@ protected function assertIds(array $expected_ids = []) {
     $result = $this->xpath('//span[@class="field-content"]');
     $ids = [];
     foreach ($result as $element) {
-      $ids[] = (int) $element;
+      $ids[] = $element->getText();
     }
     $this->assertEqual($ids, $expected_ids);
   }
diff --git a/core/modules/block_content/src/Tests/Views/BlockContentRedirectTest.php b/core/modules/block_content/tests/src/Functional/Views/BlockContentRedirectTest.php
similarity index 95%
rename from core/modules/block_content/src/Tests/Views/BlockContentRedirectTest.php
rename to core/modules/block_content/tests/src/Functional/Views/BlockContentRedirectTest.php
index 828aa8468b..10ce140e96 100644
--- a/core/modules/block_content/src/Tests/Views/BlockContentRedirectTest.php
+++ b/core/modules/block_content/tests/src/Functional/Views/BlockContentRedirectTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests\Views;
+namespace Drupal\Tests\block_content\Functional\Views;
 
 /**
  * Tests the redirect destination on block content on entity operations.
diff --git a/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php b/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
similarity index 96%
copy from core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
copy to core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
index db665c9e45..ffce588605 100644
--- a/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
+++ b/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\block_content\Tests\Views;
+namespace Drupal\Tests\block_content\Functional\Views;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Utility\SafeMarkup;
-use Drupal\views\Tests\ViewTestBase;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 
 /**
diff --git a/core/modules/block_content/src/Tests/Views/FieldTypeTest.php b/core/modules/block_content/tests/src/Functional/Views/FieldTypeTest.php
similarity index 93%
rename from core/modules/block_content/src/Tests/Views/FieldTypeTest.php
rename to core/modules/block_content/tests/src/Functional/Views/FieldTypeTest.php
index e9aa336985..8ff2fc05ca 100644
--- a/core/modules/block_content/src/Tests/Views/FieldTypeTest.php
+++ b/core/modules/block_content/tests/src/Functional/Views/FieldTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests\Views;
+namespace Drupal\Tests\block_content\Functional\Views;
 
 use Drupal\views\Views;
 
diff --git a/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php b/core/modules/block_content/tests/src/Functional/Views/RevisionRelationshipsTest.php
similarity index 92%
rename from core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
rename to core/modules/block_content/tests/src/Functional/Views/RevisionRelationshipsTest.php
index 7bad093dd3..0ccebd2a9f 100644
--- a/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
+++ b/core/modules/block_content/tests/src/Functional/Views/RevisionRelationshipsTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\block_content\Tests\Views;
+namespace Drupal\Tests\block_content\Functional\Views;
 
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\block_content\Entity\BlockContent;
-use Drupal\views\Tests\ViewTestBase;
+use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestData;
 
@@ -29,8 +29,8 @@ class RevisionRelationshipsTest extends ViewTestBase {
    */
   public static $testViews = ['test_block_content_revision_id', 'test_block_content_revision_revision_id'];
 
-  protected function setUp() {
-    parent::setUp();
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
     BlockContentType::create([
       'id' => 'basic',
       'label' => 'basic',