diff --git a/tests/acceptance/config/behat-core.yml b/tests/acceptance/config/behat-core.yml
index 135a1d58cb..e59aaf615c 100644
--- a/tests/acceptance/config/behat-core.yml
+++ b/tests/acceptance/config/behat-core.yml
@@ -314,10 +314,10 @@ default:
         - TrashbinContext:
         - PublicWebDavContext:
         - FilesVersionsContext:
-        - WebDavPropertiesContext:
-        - OcisConfigContext:
         - SpacesContext:
         - SharingNgContext:
+        - WebDavPropertiesContext:
+        - OcisConfigContext:
 
   extensions:
     rdx\behatvars\BehatVariablesExtension: ~
diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature
index d222784c71..a7c95c43ff 100644
--- a/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature
@@ -126,9 +126,11 @@ Feature: propagation of etags when copying files or folders
     And using <dav-path-version> DAV path
     And user "Alice" has created folder "/upload"
     And user "Alice" has uploaded file with content "uploaded content" to "/upload/file.txt"
-    And user "Alice" has created a public link share with settings
-      | path        | upload |
-      | permissions | change |
+    And using SharingNG
+    And user "Alice" has created the following resource link share:
+      | resource        | upload   |
+      | space           | Personal |
+      | permissionsRole | edit     |
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/upload"
     And user "Alice" has stored etag of element "/upload/file.txt"
@@ -160,7 +162,12 @@ Feature: propagation of etags when copying files or folders
     And using <dav-path-version> DAV path
     And user "Alice" has created folder "/upload"
     And user "Alice" has uploaded file with content "uploaded content" to "/upload/file.txt"
-    And user "Alice" has shared folder "/upload" with user "Brian"
+    And user "Alice" has sent the following resource share invitation:
+      | resource        | upload   |
+      | space           | Personal |
+      | sharee          | Brian    |
+      | shareType       | user     |
+      | permissionsRole | Editor   |
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/upload"
     And user "Alice" has stored etag of element "/upload/file.txt"
@@ -196,7 +203,12 @@ Feature: propagation of etags when copying files or folders
     And using <dav-path-version> DAV path
     And user "Alice" has created folder "/upload"
     And user "Alice" has uploaded file with content "uploaded content" to "/upload/file.txt"
-    And user "Alice" has shared folder "/upload" with user "Brian"
+    And user "Alice" has sent the following resource share invitation:
+      | resource        | upload   |
+      | space           | Personal |
+      | sharee          | Brian    |
+      | shareType       | user     |
+      | permissionsRole | Editor   |
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/upload"
     And user "Alice" has stored etag of element "/upload/file.txt"