diff --git a/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php b/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
index 5bd5ca0..973e162 100644
--- a/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
@@ -4,9 +4,9 @@
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\CommentManagerInterface;
-use Drupal\comment\Tests\CommentTestBase;
 use Drupal\user\RoleInterface;
 use Drupal\comment\Entity\Comment;
+use Drupal\Tests\comment\Functional\CommentTestBase;
 
 /**
  * Tests the RDFa markup of comments.
diff --git a/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php b/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
index 1a6e685..4d25c39 100644
--- a/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
@@ -3,9 +3,9 @@
 namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\image\Entity\ImageStyle;
-use Drupal\image\Tests\ImageFieldTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\file\Entity\File;
+use Drupal\Tests\image\Functional\ImageFieldTestBase;
 
 /**
  * Tests the RDFa markup of imagefields.