tests/src/Functional/NodeTest.php         | 11 -----------
 tests/src/Functional/ResourceTestBase.php |  5 +++--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/tests/src/Functional/NodeTest.php b/tests/src/Functional/NodeTest.php
index 830dc50..96db635 100644
--- a/tests/src/Functional/NodeTest.php
+++ b/tests/src/Functional/NodeTest.php
@@ -143,7 +143,6 @@ class NodeTest extends ResourceTestBase {
           /* 'changed' => $this->formatExpectedTimestampItemValues($this->entity->getChangedTime()), */
           'default_langcode' => TRUE,
           'langcode' => 'en',
-          'nid' => 1,
           'path' => [
             'alias' => '/llama',
             'pid' => 1,
@@ -163,16 +162,6 @@ class NodeTest extends ResourceTestBase {
           'vid' => 1,
         ],
         'relationships' => [
-          'type' => [
-            'data' => [
-              'id' => NodeType::load('camelids')->uuid(),
-              'type' => 'node_type--node_type',
-            ],
-            'links' => [
-              'related' => $self_url . '/type',
-              'self' => $self_url . '/relationships/type',
-            ],
-          ],
           'uid' => [
             'data' => [
               'id' => $author->uuid(),
diff --git a/tests/src/Functional/ResourceTestBase.php b/tests/src/Functional/ResourceTestBase.php
index b9ccbe0..1e7e45e 100644
--- a/tests/src/Functional/ResourceTestBase.php
+++ b/tests/src/Functional/ResourceTestBase.php
@@ -2535,9 +2535,10 @@ abstract class ResourceTestBase extends BrowserTestBase {
     $fields = $entity instanceof ContentEntityInterface
       ? iterator_to_array($entity)
       : [];
-    return array_reduce($fields, function ($field_names, $field) {
+    $bundle_field_name = $entity->getEntityType()->getKey('bundle');
+    return array_reduce($fields, function ($field_names, $field) use ($bundle_field_name) {
       /* @var \Drupal\Core\Field\FieldItemListInterface $field */
-      if (static::isReferenceFieldDefinition($field->getFieldDefinition())) {
+      if (static::isReferenceFieldDefinition($field->getFieldDefinition()) && $field->getName() !== $bundle_field_name) {
         $field_names[] = $field->getName();
       }
       return $field_names;