diff --git a/core/modules/system/tests/src/Kernel/File/RemoteFileDirectoryTest.php b/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php
similarity index 82%
rename from core/modules/system/tests/src/Kernel/File/RemoteFileDirectoryTest.php
rename to core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php
index 4033a4b..a34cc26 100644
--- a/core/modules/system/tests/src/Kernel/File/RemoteFileDirectoryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php
@@ -2,12 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\File\RemoteFileDirectoryTest.
+ * Contains \Drupal\KernelTests\Core\File\RemoteFileDirectoryTest.
  */
 
-namespace Drupal\Tests\system\Kernel\File;
-
-use Drupal\KernelTests\Core\File\DirectoryTest;
+namespace Drupal\KernelTests\Core\File;
 
 /**
  * Tests operations dealing with directories.
diff --git a/core/modules/system/tests/src/Kernel/File/RemoteFileScanDirectoryTest.php b/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php
similarity index 81%
rename from core/modules/system/tests/src/Kernel/File/RemoteFileScanDirectoryTest.php
rename to core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php
index 0388d63..162b3de 100644
--- a/core/modules/system/tests/src/Kernel/File/RemoteFileScanDirectoryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php
@@ -2,11 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\File\RemoteFileScanDirectoryTest.
+ * Contains \Drupal\KernelTests\Core\File\RemoteFileScanDirectoryTest.
  */
 
-namespace Drupal\Tests\system\Kernel\File;
-use Drupal\KernelTests\Core\File\ScanDirectoryTest;
+namespace Drupal\KernelTests\Core\File;
 
 /**
  * Tests the file_scan_directory() function.
diff --git a/core/modules/system/tests/src/Kernel/Image/ToolkitGdTest.php b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
similarity index 99%
rename from core/modules/system/tests/src/Kernel/Image/ToolkitGdTest.php
rename to core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
index f47d801..3601c1b 100644
--- a/core/modules/system/tests/src/Kernel/Image/ToolkitGdTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\Image\ToolkitGdTest.
+ * Contains \Drupal\KernelTests\Core\Image\ToolkitGdTest.
  */
 
-namespace Drupal\Tests\system\Kernel\Image;
+namespace Drupal\KernelTests\Core\Image;
 
 use Drupal\Core\Image\ImageInterface;
 use Drupal\Component\Utility\SafeMarkup;