diff --git a/core/modules/aggregator/src/Tests/Update/AggregatorUpdateTest.php b/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php
similarity index 82%
rename from core/modules/aggregator/src/Tests/Update/AggregatorUpdateTest.php
rename to core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php
index 374a38e89a..9d659d018a 100644
--- a/core/modules/aggregator/src/Tests/Update/AggregatorUpdateTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Update/AggregatorUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\aggregator\Tests\Update;
+namespace Drupal\Tests\aggregator\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests that node settings are properly updated during database updates.
@@ -16,7 +16,7 @@ class AggregatorUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/block/src/Tests/Update/BlockConditionMissingSchemaUpdateTest.php b/core/modules/block/tests/src/Functional/Update/BlockConditionMissingSchemaUpdateTest.php
similarity index 79%
rename from core/modules/block/src/Tests/Update/BlockConditionMissingSchemaUpdateTest.php
rename to core/modules/block/tests/src/Functional/Update/BlockConditionMissingSchemaUpdateTest.php
index 8eef2e377b..f5e19a0594 100644
--- a/core/modules/block/src/Tests/Update/BlockConditionMissingSchemaUpdateTest.php
+++ b/core/modules/block/tests/src/Functional/Update/BlockConditionMissingSchemaUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\block\Tests\Update;
+namespace Drupal\Tests\block\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests the upgrade path for block with conditions missing context.
@@ -34,8 +34,8 @@ class BlockConditionMissingSchemaUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/drupal-8.block-test-enabled-missing-schema.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.block-test-enabled-missing-schema.php',
     ];
   }
 
diff --git a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateFilledTest.php b/core/modules/block/tests/src/Functional/Update/BlockContextMappingUpdateFilledTest.php
similarity index 64%
rename from core/modules/block/src/Tests/Update/BlockContextMappingUpdateFilledTest.php
rename to core/modules/block/tests/src/Functional/Update/BlockContextMappingUpdateFilledTest.php
index dafd538d24..55650c5135 100644
--- a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateFilledTest.php
+++ b/core/modules/block/tests/src/Functional/Update/BlockContextMappingUpdateFilledTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block\Tests\Update;
+namespace Drupal\Tests\block\Functional\Update;
 
 /**
  * Runs BlockContextMappingUpdateTest with a dump filled with content.
@@ -14,7 +14,7 @@ class BlockContextMappingUpdateFilledTest extends BlockContextMappingUpdateTest
    */
   protected function setDatabaseDumpFiles() {
     parent::setDatabaseDumpFiles();
-    $this->databaseDumpFiles[0] = __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    $this->databaseDumpFiles[0] = __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz';
   }
 
 }
diff --git a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php b/core/modules/block/tests/src/Functional/Update/BlockContextMappingUpdateTest.php
similarity index 88%
rename from core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
rename to core/modules/block/tests/src/Functional/Update/BlockContextMappingUpdateTest.php
index 8a3106d628..d1acb3b414 100644
--- a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
+++ b/core/modules/block/tests/src/Functional/Update/BlockContextMappingUpdateTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\block\Tests\Update;
+namespace Drupal\Tests\block\Functional\Update;
 
 use Drupal\block\Entity\Block;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\node\Entity\Node;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
 
 /**
  * Tests the upgrade path for block context mapping renames.
@@ -25,10 +25,10 @@ class BlockContextMappingUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php',
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.language-enabled.php',
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.block-test-enabled.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.language-enabled.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.block-test-enabled.php',
     ];
   }
 
diff --git a/core/modules/block/src/Tests/Update/BlockRemoveDisabledRegionUpdateTest.php b/core/modules/block/tests/src/Functional/Update/BlockRemoveDisabledRegionUpdateTest.php
similarity index 83%
rename from core/modules/block/src/Tests/Update/BlockRemoveDisabledRegionUpdateTest.php
rename to core/modules/block/tests/src/Functional/Update/BlockRemoveDisabledRegionUpdateTest.php
index 60ba24c712..4409c2868e 100644
--- a/core/modules/block/src/Tests/Update/BlockRemoveDisabledRegionUpdateTest.php
+++ b/core/modules/block/tests/src/Functional/Update/BlockRemoveDisabledRegionUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\block\Tests\Update;
+namespace Drupal\Tests\block\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests the upgrade path for removal of disabled region.
@@ -23,8 +23,8 @@ class BlockRemoveDisabledRegionUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.update-test-block-disabled-2513534.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.update-test-block-disabled-2513534.php',
     ];
   }
 
diff --git a/core/modules/block_content/src/Tests/BlockContentUpdateTest.php b/core/modules/block_content/tests/src/Functional/Update/BlockContentUpdateTest.php
similarity index 88%
rename from core/modules/block_content/src/Tests/BlockContentUpdateTest.php
rename to core/modules/block_content/tests/src/Functional/Update/BlockContentUpdateTest.php
index 77c12c653b..804bf38679 100644
--- a/core/modules/block_content/src/Tests/BlockContentUpdateTest.php
+++ b/core/modules/block_content/tests/src/Functional/Update/BlockContentUpdateTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional\Update;
 
 use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests update functions for the Block Content module.
@@ -17,7 +17,7 @@ class BlockContentUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/comment/src/Tests/Update/CommentAdminViewUpdateTest.php b/core/modules/comment/tests/src/Functional/Update/CommentAdminViewUpdateTest.php
similarity index 88%
rename from core/modules/comment/src/Tests/Update/CommentAdminViewUpdateTest.php
rename to core/modules/comment/tests/src/Functional/Update/CommentAdminViewUpdateTest.php
index 87f8f23a09..7e2ba6278f 100644
--- a/core/modules/comment/src/Tests/Update/CommentAdminViewUpdateTest.php
+++ b/core/modules/comment/tests/src/Functional/Update/CommentAdminViewUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\comment\Tests\Update;
+namespace Drupal\Tests\comment\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests that comment admin view is enabled after update.
@@ -23,7 +23,7 @@ class CommentAdminViewUpdateTest extends UpdatePathTestBase {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/comment/src/Tests/Update/CommentUpdateTest.php b/core/modules/comment/tests/src/Functional/Update/CommentUpdateTest.php
similarity index 92%
rename from core/modules/comment/src/Tests/Update/CommentUpdateTest.php
rename to core/modules/comment/tests/src/Functional/Update/CommentUpdateTest.php
index 3db9c4a67b..e623132bbb 100644
--- a/core/modules/comment/src/Tests/Update/CommentUpdateTest.php
+++ b/core/modules/comment/tests/src/Functional/Update/CommentUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\comment\Tests\Update;
+namespace Drupal\Tests\comment\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests that comment settings are properly updated during database updates.
@@ -16,7 +16,7 @@ class CommentUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.filled.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8-rc1.filled.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/contact/src/Tests/Update/ContactUpdateTest.php b/core/modules/contact/tests/src/Functional/Update/ContactUpdateTest.php
similarity index 90%
rename from core/modules/contact/src/Tests/Update/ContactUpdateTest.php
rename to core/modules/contact/tests/src/Functional/Update/ContactUpdateTest.php
index 4cbfd64aaa..676f938c19 100644
--- a/core/modules/contact/src/Tests/Update/ContactUpdateTest.php
+++ b/core/modules/contact/tests/src/Functional/Update/ContactUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\contact\Tests\Update;
+namespace Drupal\Tests\contact\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests contact update path.
@@ -16,7 +16,7 @@ class ContactUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/content_translation/src/Tests/Update/ContentTranslationUpdateTest.php b/core/modules/content_translation/tests/src/Functional/Update/ContentTranslationUpdateTest.php
similarity index 91%
rename from core/modules/content_translation/src/Tests/Update/ContentTranslationUpdateTest.php
rename to core/modules/content_translation/tests/src/Functional/Update/ContentTranslationUpdateTest.php
index 85b952c35b..25be0def24 100644
--- a/core/modules/content_translation/src/Tests/Update/ContentTranslationUpdateTest.php
+++ b/core/modules/content_translation/tests/src/Functional/Update/ContentTranslationUpdateTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\content_translation\Tests\Update;
+namespace Drupal\Tests\content_translation\Functional\Update;
 
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\system\Tests\Entity\EntityDefinitionTestTrait;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
 
 /**
  * Tests the upgrade path for the Content Translation module.
@@ -60,7 +60,7 @@ protected function setUp() {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz',
     ];
   }
 
diff --git a/core/modules/dblog/src/Tests/Update/DblogFiltersAndFieldsUpgradeTest.php b/core/modules/dblog/tests/src/Functional/Update/DblogFiltersAndFieldsUpgradeTest.php
similarity index 90%
rename from core/modules/dblog/src/Tests/Update/DblogFiltersAndFieldsUpgradeTest.php
rename to core/modules/dblog/tests/src/Functional/Update/DblogFiltersAndFieldsUpgradeTest.php
index d988d71e9d..e512f5f5d8 100644
--- a/core/modules/dblog/src/Tests/Update/DblogFiltersAndFieldsUpgradeTest.php
+++ b/core/modules/dblog/tests/src/Functional/Update/DblogFiltersAndFieldsUpgradeTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\dblog\Tests\Update;
+namespace Drupal\Tests\dblog\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\views\Views;
 use Drupal\Core\Serialization\Yaml;
 
@@ -20,8 +20,8 @@ class DblogFiltersAndFieldsUpgradeTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/dblog-2851293.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/dblog-2851293.php',
     ];
   }
 
diff --git a/core/modules/dblog/src/Tests/Update/DblogRecentLogsUsingViewsUpdateTest.php b/core/modules/dblog/tests/src/Functional/Update/DblogRecentLogsUsingViewsUpdateTest.php
similarity index 82%
rename from core/modules/dblog/src/Tests/Update/DblogRecentLogsUsingViewsUpdateTest.php
rename to core/modules/dblog/tests/src/Functional/Update/DblogRecentLogsUsingViewsUpdateTest.php
index 4ea6d49f9b..851c15ee71 100644
--- a/core/modules/dblog/src/Tests/Update/DblogRecentLogsUsingViewsUpdateTest.php
+++ b/core/modules/dblog/tests/src/Functional/Update/DblogRecentLogsUsingViewsUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\dblog\Tests\Update;
+namespace Drupal\Tests\dblog\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Ensures that update hook that creates the watchdog view ran sucessfully.
@@ -16,7 +16,7 @@ class DblogRecentLogsUsingViewsUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/editor/src/Tests/Update/EditorUpdateTest.php b/core/modules/editor/tests/src/Functional/Update/EditorUpdateTest.php
similarity index 88%
rename from core/modules/editor/src/Tests/Update/EditorUpdateTest.php
rename to core/modules/editor/tests/src/Functional/Update/EditorUpdateTest.php
index e7f0f4435b..a143c053d3 100644
--- a/core/modules/editor/src/Tests/Update/EditorUpdateTest.php
+++ b/core/modules/editor/tests/src/Functional/Update/EditorUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\editor\Tests\Update;
+namespace Drupal\Tests\editor\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests Editor module database updates.
@@ -16,9 +16,9 @@ class EditorUpdateTest extends UpdatePathTestBase {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
       // Simulate an un-synchronized environment.
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.editor-editor_update_8001.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.editor-editor_update_8001.php',
     ];
   }
 
diff --git a/core/modules/field/src/Tests/Update/EmailWidgetSizeSettingUpdateTest.php b/core/modules/field/tests/src/Functional/Update/EmailWidgetSizeSettingUpdateTest.php
similarity index 83%
rename from core/modules/field/src/Tests/Update/EmailWidgetSizeSettingUpdateTest.php
rename to core/modules/field/tests/src/Functional/Update/EmailWidgetSizeSettingUpdateTest.php
index 2703bb5e48..6e15170c89 100644
--- a/core/modules/field/src/Tests/Update/EmailWidgetSizeSettingUpdateTest.php
+++ b/core/modules/field/tests/src/Functional/Update/EmailWidgetSizeSettingUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\field\Tests\Update;
+namespace Drupal\Tests\field\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests the update for the 'size' setting of the 'email_default' field widget.
@@ -16,8 +16,8 @@ class EmailWidgetSizeSettingUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/drupal-8.email_widget_size_setting-2578741.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.email_widget_size_setting-2578741.php',
     ];
   }
 
diff --git a/core/modules/field/src/Tests/Update/EntityReferenceHandlerSettingUpdateTest.php b/core/modules/field/tests/src/Functional/Update/EntityReferenceHandlerSettingUpdateTest.php
similarity index 86%
rename from core/modules/field/src/Tests/Update/EntityReferenceHandlerSettingUpdateTest.php
rename to core/modules/field/tests/src/Functional/Update/EntityReferenceHandlerSettingUpdateTest.php
index aefdcafac9..0fade3760f 100644
--- a/core/modules/field/src/Tests/Update/EntityReferenceHandlerSettingUpdateTest.php
+++ b/core/modules/field/tests/src/Functional/Update/EntityReferenceHandlerSettingUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\field\Tests\Update;
+namespace Drupal\Tests\field\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests the update for the entity reference 'handler' setting.
@@ -16,7 +16,7 @@ class EntityReferenceHandlerSettingUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/field/src/Tests/Update/FieldUpdateTest.php b/core/modules/field/tests/src/Functional/Update/FieldUpdateTest.php
similarity index 94%
rename from core/modules/field/src/Tests/Update/FieldUpdateTest.php
rename to core/modules/field/tests/src/Functional/Update/FieldUpdateTest.php
index be31a09351..577da7147c 100644
--- a/core/modules/field/src/Tests/Update/FieldUpdateTest.php
+++ b/core/modules/field/tests/src/Functional/Update/FieldUpdateTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\field\Tests\Update;
+namespace Drupal\Tests\field\Functional\Update;
 
 use Drupal\Core\Config\Config;
 use Drupal\field\Entity\FieldConfig;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\node\Entity\Node;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
 
 /**
  * Tests that field settings are properly updated during database updates.
@@ -34,8 +34,8 @@ protected function setUp() {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/drupal-8.views_entity_reference_plugins-2429191.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.views_entity_reference_plugins-2429191.php',
     ];
   }
 
diff --git a/core/modules/file/src/Tests/Update/FileUsageTemporaryDeletionConfigurationUpdateTest.php b/core/modules/file/tests/src/Functional/Update/FileUsageTemporaryDeletionConfigurationUpdateTest.php
similarity index 81%
rename from core/modules/file/src/Tests/Update/FileUsageTemporaryDeletionConfigurationUpdateTest.php
rename to core/modules/file/tests/src/Functional/Update/FileUsageTemporaryDeletionConfigurationUpdateTest.php
index f1fef088cf..e9973def61 100644
--- a/core/modules/file/src/Tests/Update/FileUsageTemporaryDeletionConfigurationUpdateTest.php
+++ b/core/modules/file/tests/src/Functional/Update/FileUsageTemporaryDeletionConfigurationUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\file\Tests\Update;
+namespace Drupal\Tests\file\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests the upgrade path for setting the file usage deletion configuration.
@@ -23,7 +23,7 @@ class FileUsageTemporaryDeletionConfigurationUpdateTest extends UpdatePathTestBa
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/hal/tests/src/Functional/Update/CreateHalSettingsForLinkDomainUpdateTest.php b/core/modules/hal/tests/src/Functional/Update/CreateHalSettingsForLinkDomainUpdateTest.php
index dbc999c9d4..5afed645c5 100644
--- a/core/modules/hal/tests/src/Functional/Update/CreateHalSettingsForLinkDomainUpdateTest.php
+++ b/core/modules/hal/tests/src/Functional/Update/CreateHalSettingsForLinkDomainUpdateTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\hal\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests that 'hal.settings' is created, to store 'link_domain'.
diff --git a/core/modules/hal/tests/src/Functional/Update/MigrateLinkDomainSettingFromRestToHalUpdateTest.php b/core/modules/hal/tests/src/Functional/Update/MigrateLinkDomainSettingFromRestToHalUpdateTest.php
index 1677420752..344caf1e1c 100644
--- a/core/modules/hal/tests/src/Functional/Update/MigrateLinkDomainSettingFromRestToHalUpdateTest.php
+++ b/core/modules/hal/tests/src/Functional/Update/MigrateLinkDomainSettingFromRestToHalUpdateTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\hal\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * 'link_domain' is migrated from 'rest.settings' to 'hal.settings'.
diff --git a/core/modules/image/src/Tests/Update/ImageUpdateTest.php b/core/modules/image/tests/src/Functional/Update/ImageUpdateTest.php
similarity index 88%
rename from core/modules/image/src/Tests/Update/ImageUpdateTest.php
rename to core/modules/image/tests/src/Functional/Update/ImageUpdateTest.php
index f3d4775b6a..c3a5ddf270 100644
--- a/core/modules/image/src/Tests/Update/ImageUpdateTest.php
+++ b/core/modules/image/tests/src/Functional/Update/ImageUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\image\Tests\Update;
+namespace Drupal\Tests\image\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests Image update path.
@@ -16,7 +16,7 @@ class ImageUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/language/src/Tests/Update/LanguageSelectWidgetUpdateTest.php b/core/modules/language/tests/src/Functional/Update/LanguageSelectWidgetUpdateTest.php
similarity index 81%
rename from core/modules/language/src/Tests/Update/LanguageSelectWidgetUpdateTest.php
rename to core/modules/language/tests/src/Functional/Update/LanguageSelectWidgetUpdateTest.php
index b0559831a9..afc8464609 100644
--- a/core/modules/language/src/Tests/Update/LanguageSelectWidgetUpdateTest.php
+++ b/core/modules/language/tests/src/Functional/Update/LanguageSelectWidgetUpdateTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\language\Tests\Update;
+namespace Drupal\Tests\language\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests the update path for the language_select widget.
@@ -17,7 +17,7 @@ class LanguageSelectWidgetUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/node/src/Tests/Update/NodeUpdateTest.php b/core/modules/node/tests/src/Functional/Update/NodeUpdateTest.php
similarity index 90%
rename from core/modules/node/src/Tests/Update/NodeUpdateTest.php
rename to core/modules/node/tests/src/Functional/Update/NodeUpdateTest.php
index b193ea8d21..223676b31e 100644
--- a/core/modules/node/src/Tests/Update/NodeUpdateTest.php
+++ b/core/modules/node/tests/src/Functional/Update/NodeUpdateTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\node\Tests\Update;
+namespace Drupal\Tests\node\Functional\Update;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests that node settings are properly updated during database updates.
@@ -17,7 +17,7 @@ class NodeUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/responsive_image/src/Tests/Update/ResponsiveImageUpdateTest.php b/core/modules/responsive_image/tests/src/Functional/Update/ResponsiveImageUpdateTest.php
similarity index 92%
rename from core/modules/responsive_image/src/Tests/Update/ResponsiveImageUpdateTest.php
rename to core/modules/responsive_image/tests/src/Functional/Update/ResponsiveImageUpdateTest.php
index 1a82bb7b13..49589e4090 100644
--- a/core/modules/responsive_image/src/Tests/Update/ResponsiveImageUpdateTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/Update/ResponsiveImageUpdateTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\responsive_image\Tests\Update;
+namespace Drupal\Tests\responsive_image\Functional\Update;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Serialization\Yaml;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests responsive image module updates.
@@ -18,7 +18,7 @@ class ResponsiveImageUpdateTest extends UpdatePathTestBase {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/rest/src/Tests/Update/EntityResourcePermissionsUpdateTest.php b/core/modules/rest/tests/src/Functional/Update/EntityResourcePermissionsUpdateTest.php
similarity index 86%
rename from core/modules/rest/src/Tests/Update/EntityResourcePermissionsUpdateTest.php
rename to core/modules/rest/tests/src/Functional/Update/EntityResourcePermissionsUpdateTest.php
index 989159e1ca..9add9c5d90 100644
--- a/core/modules/rest/src/Tests/Update/EntityResourcePermissionsUpdateTest.php
+++ b/core/modules/rest/tests/src/Functional/Update/EntityResourcePermissionsUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\rest\Tests\Update;
+namespace Drupal\Tests\rest\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests that existing sites continue to use permissions for EntityResource.
@@ -23,8 +23,8 @@ class EntityResourcePermissionsUpdateTest extends UpdatePathTestBase {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../../rest/tests/fixtures/update/drupal-8.rest-rest_update_8203.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.rest-rest_update_8203.php',
     ];
   }
 
diff --git a/core/modules/rest/src/Tests/Update/ResourceGranularityUpdateTest.php b/core/modules/rest/tests/src/Functional/Update/ResourceGranularityUpdateTest.php
similarity index 90%
rename from core/modules/rest/src/Tests/Update/ResourceGranularityUpdateTest.php
rename to core/modules/rest/tests/src/Functional/Update/ResourceGranularityUpdateTest.php
index c8cf89afcc..19ef5458d5 100644
--- a/core/modules/rest/src/Tests/Update/ResourceGranularityUpdateTest.php
+++ b/core/modules/rest/tests/src/Functional/Update/ResourceGranularityUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\rest\Tests\Update;
+namespace Drupal\Tests\rest\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests method-granularity REST config is simplified to resource-granularity.
@@ -24,8 +24,8 @@ class ResourceGranularityUpdateTest extends UpdatePathTestBase {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../../rest/tests/fixtures/update/drupal-8.rest-rest_post_update_resource_granularity.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.rest-rest_post_update_resource_granularity.php',
     ];
   }
 
diff --git a/core/modules/rest/src/Tests/Update/RestConfigurationEntitiesUpdateTest.php b/core/modules/rest/tests/src/Functional/Update/RestConfigurationEntitiesUpdateTest.php
similarity index 89%
rename from core/modules/rest/src/Tests/Update/RestConfigurationEntitiesUpdateTest.php
rename to core/modules/rest/tests/src/Functional/Update/RestConfigurationEntitiesUpdateTest.php
index 097da35bb1..f4d8199ab4 100644
--- a/core/modules/rest/src/Tests/Update/RestConfigurationEntitiesUpdateTest.php
+++ b/core/modules/rest/tests/src/Functional/Update/RestConfigurationEntitiesUpdateTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\rest\Tests\Update;
+namespace Drupal\Tests\rest\Functional\Update;
 
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\rest\RestResourceConfigInterface;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
 
 /**
  * Tests that rest.settings is converted to rest_resource_config entities.
@@ -26,8 +26,8 @@ class RestConfigurationEntitiesUpdateTest extends UpdatePathTestBase {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../../rest/tests/fixtures/update/drupal-8.rest-rest_update_8201.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.rest-rest_update_8201.php',
     ];
   }
 
diff --git a/core/modules/rest/src/Tests/Update/RestExportAuthUpdateTest.php b/core/modules/rest/tests/src/Functional/Update/RestExportAuthUpdateTest.php
similarity index 72%
rename from core/modules/rest/src/Tests/Update/RestExportAuthUpdateTest.php
rename to core/modules/rest/tests/src/Functional/Update/RestExportAuthUpdateTest.php
index 92cc917f6f..87cd5dbfba 100644
--- a/core/modules/rest/src/Tests/Update/RestExportAuthUpdateTest.php
+++ b/core/modules/rest/tests/src/Functional/Update/RestExportAuthUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\rest\Tests\Update;
+namespace Drupal\Tests\rest\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Ensures that update hook is run properly for REST Export config.
@@ -16,8 +16,8 @@ class RestExportAuthUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/rest-export-with-authentication.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../tests/fixtures/update/rest-export-with-authentication.php',
     ];
   }
 
diff --git a/core/modules/syslog/src/Tests/Update/SyslogUpdateTest.php b/core/modules/syslog/tests/src/Functional/Update/SyslogUpdateTest.php
similarity index 78%
rename from core/modules/syslog/src/Tests/Update/SyslogUpdateTest.php
rename to core/modules/syslog/tests/src/Functional/Update/SyslogUpdateTest.php
index 2b0482ff93..e5dfed687b 100644
--- a/core/modules/syslog/src/Tests/Update/SyslogUpdateTest.php
+++ b/core/modules/syslog/tests/src/Functional/Update/SyslogUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\syslog\Tests\Update;
+namespace Drupal\Tests\syslog\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests that syslog settings are properly updated during database updates.
@@ -16,7 +16,7 @@ class SyslogUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/system/src/Tests/Entity/Update/LangcodeToAsciiUpdateFilledTest.php b/core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateFilledTest.php
similarity index 68%
rename from core/modules/system/src/Tests/Entity/Update/LangcodeToAsciiUpdateFilledTest.php
rename to core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateFilledTest.php
index 898627c217..7e95ed7797 100644
--- a/core/modules/system/src/Tests/Entity/Update/LangcodeToAsciiUpdateFilledTest.php
+++ b/core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateFilledTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Entity\Update;
+namespace Drupal\Tests\system\Functional\Entity\Update;
 
 /**
  * Runs LangcodeToAsciiUpdateTest with a dump filled with content.
@@ -14,7 +14,7 @@ class LangcodeToAsciiUpdateFilledTest extends LangcodeToAsciiUpdateTest {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.filled.standard.php.gz',
+      __DIR__ . '/../../../../fixtures/update/drupal-8.filled.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/system/src/Tests/Entity/Update/LangcodeToAsciiUpdateTest.php b/core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateTest.php
similarity index 91%
rename from core/modules/system/src/Tests/Entity/Update/LangcodeToAsciiUpdateTest.php
rename to core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateTest.php
index 270bc4946c..d1a3cabb06 100644
--- a/core/modules/system/src/Tests/Entity/Update/LangcodeToAsciiUpdateTest.php
+++ b/core/modules/system/tests/src/Functional/Entity/Update/LangcodeToAsciiUpdateTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\system\Tests\Entity\Update;
+namespace Drupal\Tests\system\Functional\Entity\Update;
 
 use Drupal\Core\Database\Database;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests that the entity langcode fields have been updated to varchar_ascii.
@@ -17,7 +17,7 @@ class LangcodeToAsciiUpdateTest extends UpdatePathTestBase {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../fixtures/update/drupal-8.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/system/src/Tests/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php b/core/modules/system/tests/src/Functional/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php
similarity index 87%
rename from core/modules/system/src/Tests/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php
rename to core/modules/system/tests/src/Functional/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php
index ba7e028ae0..c843c835bf 100644
--- a/core/modules/system/src/Tests/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php
+++ b/core/modules/system/tests/src/Functional/Entity/Update/MoveRevisionMetadataFieldsUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\system\Tests\Entity\Update;
+namespace Drupal\Tests\system\Functional\Entity\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\views\Entity\View;
 
 /**
@@ -17,9 +17,9 @@ class MoveRevisionMetadataFieldsUpdateTest extends UpdatePathTestBase {
    */
   public function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.2.0.bare.standard_with_entity_test_revlog_enabled.php.gz',
-      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.entity-data-revision-metadata-fields-2248983.php',
-      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.views-revision-metadata-fields-2248983.php',
+      __DIR__ . '/../../../../../tests/fixtures/update/drupal-8.2.0.bare.standard_with_entity_test_revlog_enabled.php.gz',
+      __DIR__ . '/../../../../../tests/fixtures/update/drupal-8.entity-data-revision-metadata-fields-2248983.php',
+      __DIR__ . '/../../../../../tests/fixtures/update/drupal-8.views-revision-metadata-fields-2248983.php',
     ];
   }
 
diff --git a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php b/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php
similarity index 97%
rename from core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php
rename to core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php
index b6a8695205..625ee190ed 100644
--- a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php
+++ b/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\system\Tests\Entity\Update;
+namespace Drupal\Tests\system\Functional\Entity\Update;
 
 use Drupal\Core\Entity\Sql\TemporaryTableMapping;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\system\Tests\Entity\EntityDefinitionTestTrait;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
 
 /**
  * Tests updating an entity type with existing data to be revisionable.
@@ -69,8 +69,8 @@ protected function setUp() {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz',
-      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.entity-test-schema-converter-enabled.php',
+      __DIR__ . '/../../../../fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz',
+      __DIR__ . '/../../../../fixtures/update/drupal-8.entity-test-schema-converter-enabled.php',
     ];
   }
 
diff --git a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexFilledTest.php b/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaIndexFilledTest.php
similarity index 67%
rename from core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexFilledTest.php
rename to core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaIndexFilledTest.php
index 623e6c6c7c..d3c6912f95 100644
--- a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexFilledTest.php
+++ b/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaIndexFilledTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Entity\Update;
+namespace Drupal\Tests\system\Functional\Entity\Update;
 
 /**
  * Runs SqlContentEntityStorageSchemaIndexTest with a dump filled with content.
@@ -14,7 +14,7 @@ class SqlContentEntityStorageSchemaIndexFilledTest extends SqlContentEntityStora
    */
   protected function setDatabaseDumpFiles() {
     parent::setDatabaseDumpFiles();
-    $this->databaseDumpFiles[0] = __DIR__ . '/../../../../tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    $this->databaseDumpFiles[0] = __DIR__ . '/../../../../fixtures/update/drupal-8.filled.standard.php.gz';
   }
 
 }
diff --git a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexTest.php b/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaIndexTest.php
similarity index 90%
rename from core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexTest.php
rename to core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaIndexTest.php
index c92d1db2fe..3954230333 100644
--- a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexTest.php
+++ b/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaIndexTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\system\Tests\Entity\Update;
+namespace Drupal\Tests\system\Functional\Entity\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests that a newly-added index is properly created during database updates.
@@ -16,7 +16,7 @@ class SqlContentEntityStorageSchemaIndexTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../fixtures/update/drupal-8.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php b/core/modules/system/tests/src/Functional/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
similarity index 97%
rename from core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
rename to core/modules/system/tests/src/Functional/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
index ddc52fe52c..89c1d7072d 100644
--- a/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
+++ b/core/modules/system/tests/src/Functional/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\system\Tests\Entity\Update;
+namespace Drupal\Tests\system\Functional\Entity\Update;
 
 use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
 use Drupal\entity_test\Entity\EntityTest;
-use Drupal\simpletest\WebTestBase;
-use Drupal\system\Tests\Update\DbUpdatesTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\system\Functional\Update\DbUpdatesTrait;
 
 /**
  * Tests performing entity updates through the Update API.
  *
  * @group Entity
  */
-class UpdateApiEntityDefinitionUpdateTest extends WebTestBase {
+class UpdateApiEntityDefinitionUpdateTest extends BrowserTestBase {
 
   use DbUpdatesTrait;
 
diff --git a/core/modules/system/src/Tests/Update/EntityUpdateAddRevisionTranslationAffectedTest.php b/core/modules/system/tests/src/Functional/Update/EntityUpdateAddRevisionTranslationAffectedTest.php
similarity index 92%
rename from core/modules/system/src/Tests/Update/EntityUpdateAddRevisionTranslationAffectedTest.php
rename to core/modules/system/tests/src/Functional/Update/EntityUpdateAddRevisionTranslationAffectedTest.php
index 190e1753e2..84b0efaa4e 100644
--- a/core/modules/system/src/Tests/Update/EntityUpdateAddRevisionTranslationAffectedTest.php
+++ b/core/modules/system/tests/src/Functional/Update/EntityUpdateAddRevisionTranslationAffectedTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Drupal\system\Tests\Update;
+namespace Drupal\Tests\system\Functional\Update;
 
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\system\Tests\Entity\EntityDefinitionTestTrait;
 
 /**
@@ -53,7 +54,7 @@ protected function setUp() {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul_rev.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul_rev.php.gz',
     ];
   }
 
diff --git a/core/modules/system/src/Tests/Update/EntityUpdateToRevisionableAndPublishableTest.php b/core/modules/system/tests/src/Functional/Update/EntityUpdateToRevisionableAndPublishableTest.php
similarity index 96%
rename from core/modules/system/src/Tests/Update/EntityUpdateToRevisionableAndPublishableTest.php
rename to core/modules/system/tests/src/Functional/Update/EntityUpdateToRevisionableAndPublishableTest.php
index 3edf6f7d6e..503f36a7eb 100644
--- a/core/modules/system/src/Tests/Update/EntityUpdateToRevisionableAndPublishableTest.php
+++ b/core/modules/system/tests/src/Functional/Update/EntityUpdateToRevisionableAndPublishableTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Drupal\system\Tests\Update;
+namespace Drupal\Tests\system\Functional\Update;
 
 use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\system\Tests\Entity\EntityDefinitionTestTrait;
 
 /**
@@ -70,8 +71,8 @@ protected function setUp() {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz',
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.entity-test-schema-converter-enabled.php',
+      __DIR__ . '/../../../fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.entity-test-schema-converter-enabled.php',
     ];
   }
 
diff --git a/core/modules/user/src/Tests/Update/UserUpdateEmailToken.php b/core/modules/user/tests/src/Functional/Update/UserUpdateEmailToken.php
similarity index 70%
rename from core/modules/user/src/Tests/Update/UserUpdateEmailToken.php
rename to core/modules/user/tests/src/Functional/Update/UserUpdateEmailToken.php
index d321ee04f5..a01c8a57fb 100644
--- a/core/modules/user/src/Tests/Update/UserUpdateEmailToken.php
+++ b/core/modules/user/tests/src/Functional/Update/UserUpdateEmailToken.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests\Update;
+namespace Drupal\Tests\user\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
  * Tests user email token upgrade path.
@@ -16,8 +16,8 @@ class UserUpdateEmailToken extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/drupal-8.user-email-token-2587275.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.user-email-token-2587275.php',
     ];
   }
 
diff --git a/core/modules/user/src/Tests/Update/UserUpdateOrderPermissionsTest.php b/core/modules/user/tests/src/Functional/Update/UserUpdateOrderPermissionsTest.php
similarity index 79%
rename from core/modules/user/src/Tests/Update/UserUpdateOrderPermissionsTest.php
rename to core/modules/user/tests/src/Functional/Update/UserUpdateOrderPermissionsTest.php
index 344cb576e7..4d6e7f9600 100644
--- a/core/modules/user/src/Tests/Update/UserUpdateOrderPermissionsTest.php
+++ b/core/modules/user/tests/src/Functional/Update/UserUpdateOrderPermissionsTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests\Update;
+namespace Drupal\Tests\user\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\user\Entity\Role;
 
 /**
@@ -17,7 +17,7 @@ class UserUpdateOrderPermissionsTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
     ];
   }
 
diff --git a/core/modules/views/src/Tests/Update/ArgumentPlaceholderUpdatePathTest.php b/core/modules/views/tests/src/Functional/Update/ArgumentPlaceholderUpdatePathTest.php
similarity index 91%
rename from core/modules/views/src/Tests/Update/ArgumentPlaceholderUpdatePathTest.php
rename to core/modules/views/tests/src/Functional/Update/ArgumentPlaceholderUpdatePathTest.php
index c42cf19050..8d60f358b9 100644
--- a/core/modules/views/src/Tests/Update/ArgumentPlaceholderUpdatePathTest.php
+++ b/core/modules/views/tests/src/Functional/Update/ArgumentPlaceholderUpdatePathTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\views\Tests\Update;
+namespace Drupal\Tests\views\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\views\Entity\View;
 
 /**
@@ -19,8 +19,8 @@ class ArgumentPlaceholderUpdatePathTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/argument-placeholder.php'
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/argument-placeholder.php'
     ];
   }
 
diff --git a/core/modules/views/src/Tests/Update/BooleanFilterValuesUpdateTest.php b/core/modules/views/tests/src/Functional/Update/BooleanFilterValuesUpdateTest.php
similarity index 75%
rename from core/modules/views/src/Tests/Update/BooleanFilterValuesUpdateTest.php
rename to core/modules/views/tests/src/Functional/Update/BooleanFilterValuesUpdateTest.php
index c06539fffc..a4787c4471 100644
--- a/core/modules/views/src/Tests/Update/BooleanFilterValuesUpdateTest.php
+++ b/core/modules/views/tests/src/Functional/Update/BooleanFilterValuesUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\views\Tests\Update;
+namespace Drupal\Tests\views\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\views\Entity\View;
 
 /**
@@ -19,8 +19,8 @@ class BooleanFilterValuesUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/boolean-filter-values.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/boolean-filter-values.php',
     ];
   }
 
diff --git a/core/modules/views/src/Tests/Update/CacheabilityMetadataUpdateTest.php b/core/modules/views/tests/src/Functional/Update/CacheabilityMetadataUpdateTest.php
similarity index 81%
rename from core/modules/views/src/Tests/Update/CacheabilityMetadataUpdateTest.php
rename to core/modules/views/tests/src/Functional/Update/CacheabilityMetadataUpdateTest.php
index ef203b2a43..6410a608f1 100644
--- a/core/modules/views/src/Tests/Update/CacheabilityMetadataUpdateTest.php
+++ b/core/modules/views/tests/src/Functional/Update/CacheabilityMetadataUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\views\Tests\Update;
+namespace Drupal\Tests\views\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\views\Views;
 
 /**
@@ -18,7 +18,7 @@ class CacheabilityMetadataUpdateTest extends UpdatePathTestBase {
    * {@inheritdoc}
    */
   protected function setDatabaseDumpFiles() {
-    $this->databaseDumpFiles = [__DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz'];
+    $this->databaseDumpFiles = [__DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz'];
   }
 
   /**
diff --git a/core/modules/views/src/Tests/Update/EntityViewsDataUpdateFilledTest.php b/core/modules/views/tests/src/Functional/Update/EntityViewsDataUpdateFilledTest.php
similarity index 63%
rename from core/modules/views/src/Tests/Update/EntityViewsDataUpdateFilledTest.php
rename to core/modules/views/tests/src/Functional/Update/EntityViewsDataUpdateFilledTest.php
index 57f219d937..a1ef463b13 100644
--- a/core/modules/views/src/Tests/Update/EntityViewsDataUpdateFilledTest.php
+++ b/core/modules/views/tests/src/Functional/Update/EntityViewsDataUpdateFilledTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\views\Tests\Update;
+namespace Drupal\Tests\views\Functional\Update;
 
 /**
  * Runs EntityViewsDataUpdateTest with a dump filled with content.
@@ -14,7 +14,7 @@ class EntityViewsDataUpdateFilledTest extends EntityViewsDataUpdateTest {
    */
   protected function setDatabaseDumpFiles() {
     parent::setDatabaseDumpFiles();
-    $this->databaseDumpFiles[0] = __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz';
+    $this->databaseDumpFiles[0] = __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz';
   }
 
 }
diff --git a/core/modules/views/src/Tests/Update/EntityViewsDataUpdateTest.php b/core/modules/views/tests/src/Functional/Update/EntityViewsDataUpdateTest.php
similarity index 90%
rename from core/modules/views/src/Tests/Update/EntityViewsDataUpdateTest.php
rename to core/modules/views/tests/src/Functional/Update/EntityViewsDataUpdateTest.php
index 472829cab0..2de6568e47 100644
--- a/core/modules/views/src/Tests/Update/EntityViewsDataUpdateTest.php
+++ b/core/modules/views/tests/src/Functional/Update/EntityViewsDataUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\views\Tests\Update;
+namespace Drupal\Tests\views\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\views\Views;
 
 /**
@@ -19,8 +19,8 @@ class EntityViewsDataUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.php',
     ];
   }
 
diff --git a/core/modules/views/src/Tests/Update/FieldHandlersUpdateTest.php b/core/modules/views/tests/src/Functional/Update/FieldHandlersUpdateTest.php
similarity index 81%
rename from core/modules/views/src/Tests/Update/FieldHandlersUpdateTest.php
rename to core/modules/views/tests/src/Functional/Update/FieldHandlersUpdateTest.php
index 9990094540..1af161964c 100644
--- a/core/modules/views/src/Tests/Update/FieldHandlersUpdateTest.php
+++ b/core/modules/views/tests/src/Functional/Update/FieldHandlersUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\views\Tests\Update;
+namespace Drupal\Tests\views\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\views\Entity\View;
 
 /**
@@ -19,8 +19,8 @@ class FieldHandlersUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-      __DIR__ . '/../../../tests/fixtures/update/duplicate-field-handler.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/duplicate-field-handler.php',
     ];
   }
 
diff --git a/core/modules/views/src/Tests/Update/ImageStyleDependencyUpdateTest.php b/core/modules/views/tests/src/Functional/Update/ImageStyleDependencyUpdateTest.php
similarity index 82%
rename from core/modules/views/src/Tests/Update/ImageStyleDependencyUpdateTest.php
rename to core/modules/views/tests/src/Functional/Update/ImageStyleDependencyUpdateTest.php
index 0afae2d63c..e183adedc1 100644
--- a/core/modules/views/src/Tests/Update/ImageStyleDependencyUpdateTest.php
+++ b/core/modules/views/tests/src/Functional/Update/ImageStyleDependencyUpdateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\views\Tests\Update;
+namespace Drupal\Tests\views\Functional\Update;
 
-use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 use Drupal\views\Entity\View;
 
 /**
@@ -17,8 +17,8 @@ class ImageStyleDependencyUpdateTest extends UpdatePathTestBase {
    */
   protected function setDatabaseDumpFiles() {
     $this->databaseDumpFiles = [
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
-      __DIR__ . '/../../../../system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.php',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.php',
     ];
   }