.../rest/src/Tests/NodeHalJsonBasicAuthTest.php    | 24 +++++++++++-----------
 .../rest/src/Tests/NodeResourceTestBase.php        |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/modules/rest/src/Tests/NodeHalJsonBasicAuthTest.php b/core/modules/rest/src/Tests/NodeHalJsonBasicAuthTest.php
index b851be2..3ea5d25 100644
--- a/core/modules/rest/src/Tests/NodeHalJsonBasicAuthTest.php
+++ b/core/modules/rest/src/Tests/NodeHalJsonBasicAuthTest.php
@@ -83,32 +83,32 @@ protected function getExpectedNormalizedEntity() {
     return  $normalization + [
       '_links' => [
         'self' => [
-          'href' => $this->baseUrl . 'node/1?_format=hal_json',
+          'href' => $this->baseUrl . '/node/1?_format=hal_json',
         ],
         'type' => [
-          'href' => $this->baseUrl . 'rest/type/node/camelids',
+          'href' => $this->baseUrl . '/rest/type/node/camelids',
         ],
-        $this->baseUrl . 'rest/relation/node/camelids/uid' => [
+        $this->baseUrl . '/rest/relation/node/camelids/uid' => [
           [
-            'href' => $this->baseUrl . 'user/0?_format=hal_json',
+            'href' => $this->baseUrl . '/user/0?_format=hal_json',
             'lang' => 'en',
           ],
         ],
-        $this->baseUrl . 'rest/relation/node/camelids/revision_uid' => [
+        $this->baseUrl . '/rest/relation/node/camelids/revision_uid' => [
           [
-            'href' => $this->baseUrl . 'user/0?_format=hal_json',
+            'href' => $this->baseUrl . '/user/0?_format=hal_json',
           ],
         ],
       ],
       '_embedded' => [
-        $this->baseUrl . 'rest/relation/node/camelids/uid' => [
+        $this->baseUrl . '/rest/relation/node/camelids/uid' => [
           [
             '_links' => [
               'self' => [
-                'href' => $this->baseUrl . 'user/0?_format=hal_json',
+                'href' => $this->baseUrl . '/user/0?_format=hal_json',
               ],
               'type' => [
-                'href' => $this->baseUrl . 'rest/type/user/user',
+                'href' => $this->baseUrl . '/rest/type/user/user',
               ],
             ],
             'uuid' => [
@@ -117,14 +117,14 @@ protected function getExpectedNormalizedEntity() {
             'lang' => 'en',
           ],
         ],
-        $this->baseUrl . 'rest/relation/node/camelids/revision_uid' => [
+        $this->baseUrl . '/rest/relation/node/camelids/revision_uid' => [
           [
             '_links' => [
               'self' => [
-                'href' => $this->baseUrl . 'user/0?_format=hal_json',
+                'href' => $this->baseUrl . '/user/0?_format=hal_json',
               ],
               'type' => [
-                'href' => $this->baseUrl . 'rest/type/user/user',
+                'href' => $this->baseUrl . '/rest/type/user/user',
               ],
             ],
             'uuid' => [
diff --git a/core/modules/rest/src/Tests/NodeResourceTestBase.php b/core/modules/rest/src/Tests/NodeResourceTestBase.php
index 0bed097..7851140 100644
--- a/core/modules/rest/src/Tests/NodeResourceTestBase.php
+++ b/core/modules/rest/src/Tests/NodeResourceTestBase.php
@@ -115,7 +115,7 @@ protected function getExpectedNormalizedEntity() {
       ],
       'uid' => [
         [
-          'target_id' => 0,
+          'target_id' => '0',
           'target_type' => 'user',
           'target_uuid' => $author->uuid(),
           'url' => '/user/0',
@@ -123,10 +123,10 @@ protected function getExpectedNormalizedEntity() {
       ],
       'revision_uid' => [
         [
-          'target_id' => 0,
+          'target_id' => '0',
           'target_type' => 'user',
           'target_uuid' => $author->uuid(),
-          'url' => '/user/0',
+          'url' => $this->baseUrl . '/user/0',
         ],
       ],
       'revision_log' => [