diff --git a/core/modules/block/tests/block_test.info.yml b/core/modules/block/tests/modules/block_test/block_test.info.yml
similarity index 100%
rename from core/modules/block/tests/block_test.info.yml
rename to core/modules/block/tests/modules/block_test/block_test.info.yml
diff --git a/core/modules/block/tests/block_test.module b/core/modules/block/tests/modules/block_test/block_test.module
similarity index 100%
rename from core/modules/block/tests/block_test.module
rename to core/modules/block/tests/modules/block_test/block_test.module
diff --git a/core/modules/block/tests/config/block.block.stark.test_block.yml b/core/modules/block/tests/modules/block_test/config/block.block.stark.test_block.yml
similarity index 100%
rename from core/modules/block/tests/config/block.block.stark.test_block.yml
rename to core/modules/block/tests/modules/block_test/config/block.block.stark.test_block.yml
diff --git a/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
similarity index 100%
rename from core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
rename to core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
diff --git a/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
similarity index 100%
rename from core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
rename to core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
diff --git a/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
similarity index 100%
rename from core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
rename to core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
diff --git a/core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
similarity index 100%
rename from core/modules/block/tests/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
rename to core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
diff --git a/core/modules/block/tests/themes/block_test_theme/block_test_theme.info.yml b/core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml
similarity index 100%
rename from core/modules/block/tests/themes/block_test_theme/block_test_theme.info.yml
rename to core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml
diff --git a/core/modules/block/tests/block_test_views/block_test_views.info.yml b/core/modules/block/tests/modules/block_test_views/block_test_views.info.yml
similarity index 100%
rename from core/modules/block/tests/block_test_views/block_test_views.info.yml
rename to core/modules/block/tests/modules/block_test_views/block_test_views.info.yml
diff --git a/core/modules/block/tests/block_test_views/block_test_views.module b/core/modules/block/tests/modules/block_test_views/block_test_views.module
similarity index 100%
rename from core/modules/block/tests/block_test_views/block_test_views.module
rename to core/modules/block/tests/modules/block_test_views/block_test_views.module
diff --git a/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml
similarity index 100%
rename from core/modules/block/tests/block_test_views/test_views/views.view.test_view_block.yml
rename to core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml
diff --git a/core/modules/block/tests/block_test_views/test_views/views.view.test_view_block2.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml
similarity index 100%
rename from core/modules/block/tests/block_test_views/test_views/views.view.test_view_block2.yml
rename to core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml