diff --git a/core/modules/rdf/src/Tests/CommentAttributesTest.php b/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
similarity index 99%
rename from core/modules/rdf/src/Tests/CommentAttributesTest.php
rename to core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
index 8ca5798..5bd5ca0 100644
--- a/core/modules/rdf/src/Tests/CommentAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\comment\CommentInterface;
 use Drupal\comment\CommentManagerInterface;
diff --git a/core/modules/rdf/src/Tests/GetNamespacesTest.php b/core/modules/rdf/tests/src/Functional/GetNamespacesTest.php
similarity index 92%
rename from core/modules/rdf/src/Tests/GetNamespacesTest.php
rename to core/modules/rdf/tests/src/Functional/GetNamespacesTest.php
index ca46c5c..02b80ff 100644
--- a/core/modules/rdf/src/Tests/GetNamespacesTest.php
+++ b/core/modules/rdf/tests/src/Functional/GetNamespacesTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Confirm that the serialization of RDF namespaces in present in the HTML
@@ -10,7 +10,7 @@
  *
  * @group rdf
  */
-class GetNamespacesTest extends WebTestBase {
+class GetNamespacesTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php b/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
similarity index 98%
rename from core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
rename to core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
index d4d7d35..1a6e685 100644
--- a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
+++ b/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\image\Entity\ImageStyle;
 use Drupal\image\Tests\ImageFieldTestBase;