diff --git a/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php b/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php
index cad7b2b981..1731e99b7d 100644
--- a/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php
+++ b/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php
@@ -4,6 +4,7 @@
 
 use Drupal\comment\Entity\Comment;
 use Drupal\Core\Session\AnonymousUserSession;
+use Drupal\simpletest\AssertContentTrait;
 use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
 use Drupal\user\Entity\Role;
 use Drupal\user\Entity\User;
@@ -17,6 +18,8 @@
  */
 class CommentUserNameTest extends ViewsKernelTestBase {
 
+  use AssertContentTrait;
+
   /**
    * Admin user.
    *
diff --git a/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
similarity index 99%
rename from core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
rename to core/modules/image/src/Tests/ImageAdminStylesTest.php
index fa2c2f8081..5313b7fdbb 100644
--- a/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\image\Functional;
+namespace Drupal\image\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
@@ -8,7 +8,6 @@
 use Drupal\image\ImageStyleInterface;
 use Drupal\node\Entity\Node;
 use Drupal\file\Entity\File;
-use Drupal\Tests\TestFileCreationTrait;
 
 /**
  * Tests creation, deletion, and editing of image styles and effects.
@@ -17,11 +16,6 @@
  */
 class ImageAdminStylesTest extends ImageFieldTestBase {
 
-  use TestFileCreationTrait {
-    getTestFiles as drupalGetTestFiles;
-    compareFiles as drupalCompareFiles;
-  }
-
   /**
    * Given an image style, generate an image.
    */
diff --git a/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php b/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
index aecc7346cc..34e71d0f3b 100644
--- a/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
+++ b/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
@@ -4,6 +4,7 @@
 
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\image\Kernel\ImageFieldCreationTrait;
+use Drupal\Tests\TestFileCreationTrait;
 
 /**
  * Tests the endpoints used by the "image" in-place editor.
@@ -13,6 +14,9 @@
 class QuickEditImageControllerTest extends BrowserTestBase {
 
   use ImageFieldCreationTrait;
+  use TestFileCreationTrait {
+    getTestFiles as drupalGetTestFiles;
+  }
 
   /**
    * {@inheritdoc}