diff --git a/tests/acceptance/features/apiSharingNg/propfindShares.feature b/tests/acceptance/features/apiSharingNg/propfindShares.feature
index 13938fdcf..8befa10f2 100644
--- a/tests/acceptance/features/apiSharingNg/propfindShares.feature
+++ b/tests/acceptance/features/apiSharingNg/propfindShares.feature
@@ -11,35 +11,37 @@ Feature: propfind a shares
       | Carol    |
 
   @issue-4421
-  Scenario: sharee PROPFIND a shares when multiple user shares resources with same name
+  Scenario Outline: sharee PROPFIND a shares when multiple users share resource with same name
     Given user "Alice" has uploaded file with content "to share" to "textfile.txt"
+    And user "Alice" has created folder "folderToShare"
     And user "Carol" has uploaded file with content "to share" to "textfile.txt"
+    And user "Carol" has created folder "folderToShare"
     And user "Alice" has sent the following share invitation:
-      | resource        | textfile.txt |
-      | space           | Personal     |
-      | sharee          | Brian        |
-      | shareType       | user         |
-      | permissionsRole | Viewer       |
+      | resource        | <path>   |
+      | space           | Personal |
+      | sharee          | Brian    |
+      | shareType       | user     |
+      | permissionsRole | Viewer   |
     And user "Carol" has sent the following share invitation:
-      | resource        | textfile.txt |
-      | space           | Personal     |
-      | sharee          | Brian        |
-      | shareType       | user         |
-      | permissionsRole | Viewer       |
+      | resource        | <path>   |
+      | space           | Personal |
+      | sharee          | Brian    |
+      | shareType       | user     |
+      | permissionsRole | Viewer   |
     When user "Brian" sends PROPFIND request to space "Shares" using the WebDAV API
     Then the HTTP status code should be "207"
     And the "PROPFIND" response to user "Brian" should contain a space "Shares" with these key and value pairs:
       | key       | value         |
       | oc:fileid | UUIDof:Shares |
     And the "PROPFIND" response to user "Brian" should contain a mountpoint "Shares" with these key and value pairs:
-      | key              | value        |
-      | oc:name          | textfile.txt |
-      | oc:permissions   | SR           |
-      | oc:size          | 8            |
-      | d:getcontenttype | text/plain   |
+      | key            | value  |
+      | oc:name        | <path> |
+      | oc:permissions | SR     |
     And the "PROPFIND" response to user "Brian" should contain a mountpoint "Shares" with these key and value pairs:
-      | key              | value            |
-      | oc:name          | textfile (1).txt |
-      | oc:permissions   | SR               |
-      | oc:size          | 8                |
-      | d:getcontenttype | text/plain       |
+      | key            | value   |
+      | oc:name        | <path2> |
+      | oc:permissions | SR      |
+    Examples:
+      | path          | path2             |
+      | textfile.txt  | textfile (1).txt  |
+      | folderToShare | folderToShare (1) |