diff --git a/core/modules/ban/src/Tests/BanMiddlewareTest.php b/core/modules/ban/tests/src/Unit/BanMiddlewareTest.php
similarity index 96%
rename from core/modules/ban/src/Tests/BanMiddlewareTest.php
rename to core/modules/ban/tests/src/Unit/BanMiddlewareTest.php
index efa938e..ec22835 100644
--- a/core/modules/ban/src/Tests/BanMiddlewareTest.php
+++ b/core/modules/ban/tests/src/Unit/BanMiddlewareTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\ban\Tests\BanMiddlewareTest.
+ * Contains \Drupal\Tests\ban\Unit\BanMiddlewareTest.
  */
 
-namespace Drupal\ban\Tests;
+namespace Drupal\Tests\ban\Unit;
 
 use Drupal\ban\BanMiddleware;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/image/src/Tests/ImageStyleTest.php b/core/modules/image/tests/src/Unit/ImageStyleTest.php
similarity index 99%
rename from core/modules/image/src/Tests/ImageStyleTest.php
rename to core/modules/image/tests/src/Unit/ImageStyleTest.php
index 97095ba..80ce713 100644
--- a/core/modules/image/src/Tests/ImageStyleTest.php
+++ b/core/modules/image/tests/src/Unit/ImageStyleTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\image\Tests\ImageStyleTest.
+ * Contains \Drupal\Tests\image\Unit\ImageStyleTest.
  */
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Unit;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\Component\Utility\Crypt;
diff --git a/core/modules/system/src/Tests/Installer/InstallTranslationFilePatternTest.php b/core/modules/system/tests/src/Unit/Installer/InstallTranslationFilePatternTest.php
similarity index 93%
rename from core/modules/system/src/Tests/Installer/InstallTranslationFilePatternTest.php
rename to core/modules/system/tests/src/Unit/Installer/InstallTranslationFilePatternTest.php
index 51b3e47..5e02162 100644
--- a/core/modules/system/src/Tests/Installer/InstallTranslationFilePatternTest.php
+++ b/core/modules/system/tests/src/Unit/Installer/InstallTranslationFilePatternTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Installer\InstallTranslationFilePatternTest.
+ * Contains \Drupal\Tests\system\Unit\Installer\InstallTranslationFilePatternTest.
  */
 
-namespace Drupal\system\Tests\Installer;
+namespace Drupal\Tests\system\Unit\Installer;
 
 use Drupal\Core\StringTranslation\Translator\FileTranslation;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/views/src/Tests/Plugin/views/field/EntityOperationsUnitTest.php b/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
similarity index 96%
rename from core/modules/views/src/Tests/Plugin/views/field/EntityOperationsUnitTest.php
rename to core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
index 8b32482..e8eee20 100644
--- a/core/modules/views/src/Tests/Plugin/views/field/EntityOperationsUnitTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\views\Tests\Plugin\views\field\EntityOperationsUnitTest.
+ * Contains \Drupal\Tests\views\Unit\Plugin\views\field\EntityOperationsUnitTest.
  */
 
-namespace Drupal\views\Tests\Plugin\views\field {
+namespace Drupal\Tests\views\Unit\Plugin\views\field {
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\views\field\EntityOperations;