.../src/Functional/EntityResource}/EntityResourceTestBase.php          | 3 ++-
 .../src/Functional/EntityResource/Node}/NodeHalJsonBasicAuthTest.php   | 2 +-
 .../src/Functional/EntityResource/Node}/NodeJsonBasicAuthTest.php      | 2 +-
 .../src/Functional/EntityResource/Node}/NodeResourceTestBase.php       | 3 ++-
 .../rest/{src/Tests => tests/src/Functional}/ResourceTestBase.php      | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/modules/rest/src/Tests/EntityResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
similarity index 98%
rename from core/modules/rest/src/Tests/EntityResourceTestBase.php
rename to core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
index 90e4f93..232986b 100644
--- a/core/modules/rest/src/Tests/EntityResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional\EntityResource;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Url;
+use Drupal\Tests\rest\Functional\ResourceTestBase;
 use GuzzleHttp\Exception\ClientException;
 
 /**
diff --git a/core/modules/rest/src/Tests/NodeHalJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
similarity index 98%
rename from core/modules/rest/src/Tests/NodeHalJsonBasicAuthTest.php
rename to core/modules/rest/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
index 3ea5d25..dd0604d 100644
--- a/core/modules/rest/src/Tests/NodeHalJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional\EntityResource\Node;
 
 use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/core/modules/rest/src/Tests/NodeJsonBasicAuthTest.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
similarity index 90%
rename from core/modules/rest/src/Tests/NodeJsonBasicAuthTest.php
rename to core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
index c5607ee..f4a4dcc 100644
--- a/core/modules/rest/src/Tests/NodeJsonBasicAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional\EntityResource\Node;
 
 /**
  * @group rest
diff --git a/core/modules/rest/src/Tests/NodeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
similarity index 95%
rename from core/modules/rest/src/Tests/NodeResourceTestBase.php
rename to core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
index 5f346dd..1b4538b 100644
--- a/core/modules/rest/src/Tests/NodeResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional\EntityResource\Node;
 
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
 use Drupal\user\Entity\User;
 
 abstract class NodeResourceTestBase extends EntityResourceTestBase {
diff --git a/core/modules/rest/src/Tests/ResourceTestBase.php b/core/modules/rest/tests/src/Functional/ResourceTestBase.php
similarity index 98%
rename from core/modules/rest/src/Tests/ResourceTestBase.php
rename to core/modules/rest/tests/src/Functional/ResourceTestBase.php
index fe8e53b..5f178a2 100644
--- a/core/modules/rest/src/Tests/ResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/ResourceTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rest\Tests;
+namespace Drupal\Tests\rest\Functional;
 
 use Drupal\rest\RestResourceConfigInterface;
 use Drupal\Tests\BrowserTestBase;