.../src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php  | 5 +++--
 .../Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php | 7 ++++---
 .../src/Functional/EntityResource/HalEntityNormalizationTrait.php | 2 +-
 .../src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php    | 7 ++++---
 .../Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php   | 6 +++---
 .../src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php    | 5 +++--
 .../Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php   | 7 ++++---
 .../src/Functional/EntityResource/Term/TermHalJsonAnonTest.php    | 7 ++++---
 .../Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php   | 8 ++++----
 .../src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php  | 2 +-
 10 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
similarity index 80%
rename from core/modules/rest/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
rename to core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
index 80b10aa..f54dce2 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
+namespace Drupal\Tests\hal\Functional\EntityResource\Block;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase;
 
 /**
- * @group rest
+ * @group hal
  */
 class BlockHalJsonAnonTest extends BlockResourceTestBase {
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
similarity index 81%
rename from core/modules/rest/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
rename to core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
index 6b613ab..6f778b9 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
+namespace Drupal\Tests\hal\Functional\EntityResource\Block;
 
+use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
+use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase;
 
 /**
- * @group rest
+ * @group hal
  */
 class BlockHalJsonBasicAuthTest extends BlockResourceTestBase {
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php b/core/modules/hal/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php
similarity index 97%
rename from core/modules/rest/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php
rename to core/modules/hal/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php
index 1dcea7e..49ac07d 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource;
+namespace Drupal\Tests\hal\Functional\EntityResource;
 
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
similarity index 91%
rename from core/modules/rest/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
rename to core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
index 34b45a7..94ce785 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Node;
+namespace Drupal\Tests\hal\Functional\EntityResource\Node;
 
-use Drupal\Tests\rest\Functional\EntityResource\HalEntityNormalizationTrait;
+use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\Node\NodeResourceTestBase;
 use Drupal\user\Entity\User;
 
 
 /**
- * @group rest
+ * @group hal
  */
 class NodeHalJsonAnonTest extends NodeResourceTestBase {
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
similarity index 82%
rename from core/modules/rest/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
rename to core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
index a6260bb..b48bb66 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Node;
+namespace Drupal\Tests\hal\Functional\EntityResource\Node;
 
+use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
- * @group rest
+ * @group hal
  */
 class NodeHalJsonBasicAuthTest extends NodeHalJsonAnonTest {
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
similarity index 81%
rename from core/modules/rest/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
rename to core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
index d8535d2..1ecf214 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Role;
+namespace Drupal\Tests\hal\Functional\EntityResource\Role;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\Role\RoleResourceTestBase;
 
 /**
- * @group rest
+ * @group hal
  */
 class RoleHalJsonAnonTest extends RoleResourceTestBase {
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/rest/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
rename to core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
index 64e3fef..269e8f1 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Role;
+namespace Drupal\Tests\hal\Functional\EntityResource\Role;
 
+use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
+use Drupal\Tests\rest\Functional\EntityResource\Role\RoleResourceTestBase;
 
 /**
- * @group rest
+ * @group hal
  */
 class RoleHalJsonBasicAuthTest extends RoleResourceTestBase {
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
similarity index 84%
rename from core/modules/rest/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
rename to core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
index 3d0f78f..c334386 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Term;
+namespace Drupal\Tests\hal\Functional\EntityResource\Term;
 
+use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\HalEntityNormalizationTrait;
+use Drupal\Tests\rest\Functional\EntityResource\Term\TermResourceTestBase;
 
 /**
- * @group rest
+ * @group hal
  */
 class TermHalJsonAnonTest extends TermResourceTestBase {
 
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
similarity index 81%
rename from core/modules/rest/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
rename to core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
index 4df21b0..9ba8404 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
+++ b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional\EntityResource\Term;
+namespace Drupal\Tests\hal\Functional\EntityResource\Term;
 
+use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
+use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\HalEntityNormalizationTrait;
-use Drupal\Tests\rest\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
- * @group rest
+ * @group hal
  */
 class TermHalJsonBasicAuthTest extends TermHalJsonAnonTest {
 
diff --git a/core/modules/rest/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php b/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php
similarity index 95%
rename from core/modules/rest/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php
rename to core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php
index 1140b22..c4c6e39 100644
--- a/core/modules/rest/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php
+++ b/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rest\Functional;
+namespace Drupal\Tests\hal\Functional;
 
 use Psr\Http\Message\ResponseInterface;