diff --git a/tests/acceptance/features/apiGraph/userGDPRExport.feature b/tests/acceptance/features/apiGraph/userGDPRExport.feature
index e493fcf3a2..1aabd6516a 100644
--- a/tests/acceptance/features/apiGraph/userGDPRExport.feature
+++ b/tests/acceptance/features/apiGraph/userGDPRExport.feature
@@ -897,7 +897,6 @@ Feature: user GDPR (General Data Protection Regulation) report
                       "pattern": "^%user_id_pattern%$"
                     },
                     "type": {
-                      "type": "number",
                       "const": 1
                     }
                 }
@@ -915,13 +914,11 @@ Feature: user GDPR (General Data Protection Regulation) report
                       "pattern": "^%user_id_pattern%$"
                     },
                     "type": {
-                      "type": "number",
                       "const": 1
                     }
                 }
             },
             "GranteeGroupID": {
-              "type": ["number", "null"],
               "const": null
             },
             "GranteeUserID": {
@@ -937,7 +934,6 @@ Feature: user GDPR (General Data Protection Regulation) report
           }
         },
         "type": {
-          "type": "string",
           "const": "events.SpaceShared"
         }
       }
diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php
index d7bcea8fb8..ce911de6b4 100755
--- a/tests/acceptance/features/bootstrap/Sharing.php
+++ b/tests/acceptance/features/bootstrap/Sharing.php
@@ -754,7 +754,7 @@ trait Sharing {
 		$user = $this->getActualUsername($user);
 
 		if ($updateLastPublicLink) {
-			$share_id = (FeatureContext::isUsingSharingNG()) ? $this->shareNgGetLastCreatedLinkShareID() : (string) $this->getLastCreatedPublicShare()->id;
+			$share_id = ($this->isUsingSharingNG()) ? $this->shareNgGetLastCreatedLinkShareID() : (string) $this->getLastCreatedPublicShare()->id;
 		} else {
 			if ($shareOwner === null) {
 				$share_id = $this->getLastCreatedUserGroupShareId();