diff --git a/core/modules/file/tests/src/Functional/FileFieldTestBase.php b/core/modules/file/tests/src/Functional/FileFieldTestBase.php
index 25de24cc5d..dc2e8becc1 100644
--- a/core/modules/file/tests/src/Functional/FileFieldTestBase.php
+++ b/core/modules/file/tests/src/Functional/FileFieldTestBase.php
@@ -7,6 +7,7 @@
 use Drupal\file\FileInterface;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\file\Entity\File;
+use Drupal\Tests\TestFileCreationTrait;
 
 /**
  * Provides methods specifically for testing File module's field handling.
@@ -14,6 +15,9 @@
 abstract class FileFieldTestBase extends BrowserTestBase {
 
   use FileFieldCreationTrait;
+  use TestFileCreationTrait {
+    getTestFiles as drupalGetTestFiles;
+  }
 
   /**
   * Modules to enable.
diff --git a/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php b/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
index dafcbcc1c8..bf567c2615 100644
--- a/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
@@ -4,7 +4,6 @@
 
 use Drupal\Tests\file\Functional\FileFieldTestBase;
 use Drupal\file\Entity\File;
-use Drupal\Tests\TestFileCreationTrait;
 
 /**
  * Tests the RDFa markup of filefields.
@@ -13,10 +12,6 @@
  */
 class FileFieldAttributesTest extends FileFieldTestBase {
 
-  use TestFileCreationTrait {
-    getTestFiles as drupalGetTestFiles;
-  }
-
   /**
    * Modules to enable.
    *
diff --git a/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php b/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
index 87067bd68e..2e5675fe6a 100644
--- a/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\rdf\Functional;
 
-use Drupal\node\Tests\NodeTestBase;
+use Drupal\Tests\node\Functional\NodeTestBase;
 
 /**
  * Tests the RDFa markup of Nodes.