diff --git a/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature b/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature
index d111d51a9979..33f893184eff 100644
--- a/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature
+++ b/tests/acceptance/features/apiWebdavEtagPropagation1/deleteFileFolder.feature
@@ -16,7 +16,8 @@ Feature: propagation of etags when deleting a file or folder
     And user "Alice" has stored etag of element "/upload"
     And user "Alice" has stored etag of element "/upload/sub"
     When user "Alice" deletes file "/upload/sub/file.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "204"
+    And these etags should have changed:
       | user  | path        |
       | Alice | /           |
       | Alice | /upload     |
@@ -34,13 +35,16 @@ Feature: propagation of etags when deleting a file or folder
   @skipOnOcis-OC-Storage @issue-product-280
   Scenario Outline: deleting a folder changes the etags of all parents
     Given using <dav_version> DAV path
-    And user "Alice" has created folder "/upload/sub"
-    And user "Alice" has created folder "/upload/sub/toDelete"
+    And user "Alice" has created the following folders
+      | path                 |
+      | /upload/sub          |
+      | /upload/sub/toDelete |
     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/sub"
     When user "Alice" deletes folder "/upload/sub/toDelete" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "204"
+    And these etags should have changed:
       | user  | path        |
       | Alice | /           |
       | Alice | /upload     |
@@ -58,14 +62,17 @@ Feature: propagation of etags when deleting a file or folder
 
   Scenario Outline: deleting a folder with content changes the etags of all parents
     Given using <dav_version> DAV path
-    And user "Alice" has created folder "/upload/sub"
-    And user "Alice" has created folder "/upload/sub/toDelete"
+    And user "Alice" has created the following folders
+      | path                 |
+      | /upload/sub          |
+      | /upload/sub/toDelete |
     And user "Alice" has uploaded file with content "uploaded content" to "/upload/sub/toDelete/file.txt"
     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/sub"
     When user "Alice" deletes folder "/upload/sub/toDelete" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "204"
+    And these etags should have changed:
       | user  | path        |
       | Alice | /           |
       | Alice | /upload     |
@@ -96,7 +103,8 @@ Feature: propagation of etags when deleting a file or folder
     And user "Brian" has stored etag of element "/Shares/upload"
     And user "Brian" has stored etag of element "/Shares/upload/sub"
     When user "Brian" deletes file "/Shares/upload/sub/file.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "204"
+    And these etags should have changed:
       | user  | path               |
       | Alice | /                  |
       | Alice | /upload            |
@@ -131,7 +139,8 @@ Feature: propagation of etags when deleting a file or folder
     And user "Brian" has stored etag of element "/Shares/upload"
     And user "Brian" has stored etag of element "/Shares/upload/sub"
     When user "Alice" deletes file "/upload/sub/file.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "204"
+    And these etags should have changed:
       | user  | path               |
       | Alice | /                  |
       | Alice | /upload            |
@@ -156,8 +165,10 @@ Feature: propagation of etags when deleting a file or folder
     And the administrator has set the default folder for received shares to "Shares"
     And parameter "shareapi_auto_accept_share" of app "core" has been set to "no"
     And using <dav_version> DAV path
-    And user "Alice" has created folder "/upload/sub"
-    And user "Alice" has created folder "/upload/sub/toDelete"
+    And user "Alice" has created the following folders
+      | path                 |
+      | /upload/sub          |
+      | /upload/sub/toDelete |
     And user "Alice" has shared folder "/upload" with user "Brian"
     And user "Brian" has accepted share "/upload" offered by user "Alice"
     And user "Alice" has stored etag of element "/"
@@ -168,7 +179,8 @@ Feature: propagation of etags when deleting a file or folder
     And user "Brian" has stored etag of element "/Shares/upload"
     And user "Brian" has stored etag of element "/Shares/upload/sub"
     When user "Brian" deletes folder "/Shares/upload/sub/toDelete" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "204"
+    And these etags should have changed:
       | user  | path               |
       | Alice | /                  |
       | Alice | /upload            |
@@ -193,8 +205,10 @@ Feature: propagation of etags when deleting a file or folder
     And the administrator has set the default folder for received shares to "Shares"
     And parameter "shareapi_auto_accept_share" of app "core" has been set to "no"
     And using <dav_version> DAV path
-    And user "Alice" has created folder "/upload/sub"
-    And user "Alice" has created folder "/upload/sub/toDelete"
+    And user "Alice" has created the following folders
+      | path                 |
+      | /upload/sub          |
+      | /upload/sub/toDelete |
     And user "Alice" has shared folder "/upload" with user "Brian"
     And user "Brian" has accepted share "/upload" offered by user "Alice"
     And user "Alice" has stored etag of element "/"
@@ -205,7 +219,8 @@ Feature: propagation of etags when deleting a file or folder
     And user "Brian" has stored etag of element "/Shares/upload"
     And user "Brian" has stored etag of element "/Shares/upload/sub"
     When user "Alice" deletes folder "/upload/sub/toDelete" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "204"
+    And these etags should have changed:
       | user  | path               |
       | Alice | /                  |
       | Alice | /upload            |
@@ -234,7 +249,8 @@ Feature: propagation of etags when deleting a file or folder
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/upload"
     When the public deletes file "file.txt" from the last public share using the new public WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "204"
+    And these etags should have changed:
       | user  | path    |
       | Alice | /       |
       | Alice | /upload |
@@ -258,7 +274,8 @@ Feature: propagation of etags when deleting a file or folder
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/upload"
     When the public deletes folder "sub" from the last public share using the new public WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "204"
+    And these etags should have changed:
       | user  | path    |
       | Alice | /       |
       | Alice | /upload |
diff --git a/tests/acceptance/features/apiWebdavEtagPropagation1/moveFileFolder.feature b/tests/acceptance/features/apiWebdavEtagPropagation1/moveFileFolder.feature
index e97926af3c8f..c38d39758604 100644
--- a/tests/acceptance/features/apiWebdavEtagPropagation1/moveFileFolder.feature
+++ b/tests/acceptance/features/apiWebdavEtagPropagation1/moveFileFolder.feature
@@ -12,7 +12,8 @@ Feature: propagation of etags when moving files or folders
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/upload"
     When user "Alice" moves file "/upload/file.txt" to "/upload/renamed.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path    |
       | Alice | /       |
       | Alice | /upload |
@@ -29,14 +30,17 @@ Feature: propagation of etags when moving files or folders
   @skipOnOcis-OC-Storage @issue-product-280
   Scenario Outline: moving a file from one folder to an other changes the etags of both folders
     Given using <dav_version> DAV path
-    And user "Alice" has created folder "/src"
-    And user "Alice" has created folder "/dst"
+    And user "Alice" has created the following folders
+      | path |
+      | /src |
+      | /dst |
     And user "Alice" has uploaded file with content "uploaded content" to "/src/file.txt"
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/src"
     And user "Alice" has stored etag of element "/dst"
     When user "Alice" moves file "/src/file.txt" to "/dst/file.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path |
       | Alice | /    |
       | Alice | /src |
@@ -54,14 +58,17 @@ Feature: propagation of etags when moving files or folders
   @skipOnOcis-OC-Storage @issue-product-280
   Scenario Outline: moving a file into a subfolder changes the etags of all parents
     Given using <dav_version> DAV path
-    And user "Alice" has created folder "/upload"
-    And user "Alice" has created folder "/upload/sub"
+    And user "Alice" has created the following folders
+      | path        |
+      | /upload     |
+      | /upload/sub |
     And user "Alice" has uploaded file with content "uploaded content" to "/upload/file.txt"
     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/sub"
     When user "Alice" moves file "/upload/file.txt" to "/upload/sub/file.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path        |
       | Alice | /           |
       | Alice | /upload     |
@@ -79,12 +86,15 @@ Feature: propagation of etags when moving files or folders
 
   Scenario Outline: renaming a folder inside a folder changes its etag
     Given using <dav_version> DAV path
-    And user "Alice" has created folder "/upload"
-    And user "Alice" has created folder "/upload/src"
+    And user "Alice" has created the following folders
+      | path       |
+      | /upload    |
+      | /upload/src |
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/upload"
     When user "Alice" moves folder "/upload/src" to "/upload/dst" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path    |
       | Alice | /       |
       | Alice | /upload |
@@ -101,14 +111,17 @@ Feature: propagation of etags when moving files or folders
   @skipOnOcis-OC-Storage @issue-product-280
   Scenario Outline: moving a folder from one folder to an other changes the etags of both folders
     Given using <dav_version> DAV path
-    And user "Alice" has created folder "/src"
-    And user "Alice" has created folder "/src/folder"
-    And user "Alice" has created folder "/dst"
+    And user "Alice" has created the following folders
+      | path        |
+      | /src        |
+      | /src/folder |
+      | /dst        |
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/src"
     And user "Alice" has stored etag of element "/dst"
     When user "Alice" moves folder "/src/folder" to "/dst/folder" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path |
       | Alice | /    |
       | Alice | /src |
@@ -126,14 +139,17 @@ Feature: propagation of etags when moving files or folders
   @skipOnOcis-OC-Storage @issue-product-280
   Scenario Outline: moving a folder into a subfolder changes the etags of all parents
     Given using <dav_version> DAV path
-    And user "Alice" has created folder "/upload"
-    And user "Alice" has created folder "/upload/folder"
-    And user "Alice" has created folder "/upload/sub"
+    And user "Alice" has created the following folders
+      | path           |
+      | /upload        |
+      | /upload/folder |
+      | /upload/sub    |
     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/sub"
     When user "Alice" moves folder "/upload/folder" to "/upload/sub/folder" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path        |
       | Alice | /           |
       | Alice | /upload     |
@@ -164,7 +180,8 @@ Feature: propagation of etags when moving files or folders
     And user "Brian" has stored etag of element "/Shares"
     And user "Brian" has stored etag of element "/Shares/upload"
     When user "Brian" moves file "/Shares/upload/file.txt" to "/Shares/upload/renamed.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path           |
       | Alice | /              |
       | Alice | /upload        |
@@ -197,7 +214,8 @@ Feature: propagation of etags when moving files or folders
     And user "Brian" has stored etag of element "/Shares"
     And user "Brian" has stored etag of element "/Shares/upload"
     When user "Alice" moves file "/upload/file.txt" to "/upload/renamed.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path           |
       | Alice | /              |
       | Alice | /upload        |
@@ -220,8 +238,10 @@ Feature: propagation of etags when moving files or folders
     And the administrator has set the default folder for received shares to "Shares"
     And parameter "shareapi_auto_accept_share" of app "core" has been set to "no"
     And using <dav_version> DAV path
-    And user "Alice" has created folder "/src"
-    And user "Alice" has created folder "/dst"
+    And user "Alice" has created the following folders
+      | path |
+      | /src |
+      | /dst |
     And user "Alice" has uploaded file with content "uploaded content" to "/src/file.txt"
     And user "Alice" has shared folder "/src" with user "Brian"
     And user "Brian" has accepted share "/src" offered by user "Alice"
@@ -235,7 +255,8 @@ Feature: propagation of etags when moving files or folders
     And user "Brian" has stored etag of element "/Shares/src"
     And user "Brian" has stored etag of element "/Shares/dst"
     When user "Alice" moves file "/src/file.txt" to "/dst/file.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path        |
       | Alice | /           |
       | Alice | /src        |
@@ -260,8 +281,10 @@ Feature: propagation of etags when moving files or folders
     And the administrator has set the default folder for received shares to "Shares"
     And parameter "shareapi_auto_accept_share" of app "core" has been set to "no"
     And using <dav_version> DAV path
-    And user "Alice" has created folder "/src"
-    And user "Alice" has created folder "/dst"
+    And user "Alice" has created the following folders
+      | path |
+      | /src |
+      | /dst |
     And user "Alice" has uploaded file with content "uploaded content" to "/src/file.txt"
     And user "Alice" has shared folder "/src" with user "Brian"
     And user "Brian" has accepted share "/src" offered by user "Alice"
@@ -275,7 +298,8 @@ Feature: propagation of etags when moving files or folders
     And user "Brian" has stored etag of element "/Shares/src"
     And user "Brian" has stored etag of element "/Shares/dst"
     When user "Brian" moves file "/Shares/src/file.txt" to "/Shares/dst/file.txt" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path        |
       | Alice | /           |
       | Alice | /src        |
@@ -300,9 +324,11 @@ Feature: propagation of etags when moving files or folders
     And the administrator has set the default folder for received shares to "Shares"
     And parameter "shareapi_auto_accept_share" of app "core" has been set to "no"
     And using <dav_version> DAV path
-    And user "Alice" has created folder "/src"
-    And user "Alice" has created folder "/dst"
-    And user "Alice" has created folder "/src/toMove"
+    And user "Alice" has created the following folders
+      | path        |
+      | /src        |
+      | /dst        |
+      | /src/toMove |
     And user "Alice" has shared folder "/src" with user "Brian"
     And user "Brian" has accepted share "/src" offered by user "Alice"
     And user "Alice" has shared folder "/dst" with user "Brian"
@@ -315,7 +341,8 @@ Feature: propagation of etags when moving files or folders
     And user "Brian" has stored etag of element "/Shares/src"
     And user "Brian" has stored etag of element "/Shares/dst"
     When user "Alice" moves folder "/src/toMove" to "/dst/toMove" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path        |
       | Alice | /           |
       | Alice | /src        |
@@ -340,9 +367,11 @@ Feature: propagation of etags when moving files or folders
     And the administrator has set the default folder for received shares to "Shares"
     And parameter "shareapi_auto_accept_share" of app "core" has been set to "no"
     And using <dav_version> DAV path
-    And user "Alice" has created folder "/src"
-    And user "Alice" has created folder "/dst"
-    And user "Alice" has created folder "/src/toMove"
+    And user "Alice" has created the following folders
+      | path        |
+      | /src        |
+      | /dst        |
+      | /src/toMove |
     And user "Alice" has shared folder "/src" with user "Brian"
     And user "Brian" has accepted share "/src" offered by user "Alice"
     And user "Alice" has shared folder "/dst" with user "Brian"
@@ -355,7 +384,8 @@ Feature: propagation of etags when moving files or folders
     And user "Brian" has stored etag of element "/Shares/src"
     And user "Brian" has stored etag of element "/Shares/dst"
     When user "Brian" moves folder "/Shares/src/toMove" to "/Shares/dst/toMove" using the WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path        |
       | Alice | /           |
       | Alice | /src        |
@@ -385,7 +415,8 @@ Feature: propagation of etags when moving files or folders
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/upload"
     When the public renames file "file.txt" to "renamed.txt" from the last public share using the new public WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path    |
       | Alice | /       |
       | Alice | /upload |
@@ -402,15 +433,18 @@ Feature: propagation of etags when moving files or folders
 
   Scenario Outline: renaming a folder in a publicly shared folder changes its etag for the sharer
     Given using <dav_version> DAV path
-    And user "Alice" has created folder "/upload"
-    And user "Alice" has created folder "/upload/sub"
+    And user "Alice" has created the following folders
+      | path        |
+      | /upload     |
+      | /upload/sub |
     And user "Alice" has created a public link share with settings
       | path        | upload |
       | permissions | change |
     And user "Alice" has stored etag of element "/"
     And user "Alice" has stored etag of element "/upload"
     When the public renames folder "sub" to "renamed" from the last public share using the new public WebDAV API
-    Then these etags should have changed:
+    Then the HTTP status code should be "201"
+    And these etags should have changed:
       | user  | path    |
       | Alice | /       |
       | Alice | /upload |