diff --git a/tests/acceptance/features/apiSharePublicLink2/multilinkSharing.feature b/tests/acceptance/features/apiSharePublicLink2/multilinkSharing.feature
index b5ffefb4dd76..90c9e8609eab 100644
--- a/tests/acceptance/features/apiSharePublicLink2/multilinkSharing.feature
+++ b/tests/acceptance/features/apiSharePublicLink2/multilinkSharing.feature
@@ -108,8 +108,9 @@ Feature: multilinksharing
       | 1               | 100             |
       | 2               | 200             |
 
-  Scenario: Deleting a file deletes also its public links
+  Scenario Outline: Deleting a file deletes also its public links
     Given using OCS API version "1"
+    And using <dav-path> DAV path
     And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "/textfile0.txt"
     And user "Alice" has created a public link share with settings
       | path        | textfile0.txt |
@@ -128,6 +129,16 @@ Feature: multilinksharing
     When user "Alice" uploads file "filesForUpload/textfile.txt" to "/textfile0.txt" using the WebDAV API
     Then the HTTP status code should be "201"
     And as user "Alice" the file "/textfile0.txt" should not have any shares
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+    @personalSpace @skipOnOcV10
+    Examples:
+      | dav-path |
+      | spaces   |
+
 
   Scenario Outline: Deleting one public link share of a file doesn't affect the rest
     Given using OCS API version "<ocs_api_version>"
@@ -162,8 +173,9 @@ Feature: multilinksharing
       | 1               | 100             |
       | 2               | 200             |
 
-  Scenario: Overwriting a file doesn't remove its public shares
+  Scenario Outline: Overwriting a file doesn't remove its public shares
     Given using OCS API version "1"
+    And using <dav-path> DAV path
     And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "/textfile0.txt"
     And user "Alice" has created a public link share with settings
       | path        | textfile0.txt |
@@ -182,10 +194,20 @@ Feature: multilinksharing
       | path           | permissions | name        |
       | /textfile0.txt | 1           | sharedlink1 |
       | /textfile0.txt | 1           | sharedlink2 |
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+    @personalSpace @skipOnOcV10
+    Examples:
+      | dav-path |
+      | spaces   |
 
   @issue-ocis-reva-335
-  Scenario: Renaming a folder doesn't remove its public shares
+  Scenario Outline: Renaming a folder doesn't remove its public shares
     Given using OCS API version "1"
+    And using <dav-path> DAV path
     And user "Alice" has created folder "FOLDER"
     And user "Alice" has created a public link share with settings
       | path         | FOLDER      |
@@ -206,3 +228,12 @@ Feature: multilinksharing
       | path            | permissions | name        |
       | /FOLDER_RENAMED | 15          | sharedlink1 |
       | /FOLDER_RENAMED | 15          | sharedlink2 |
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+  @personalSpace @skipOnOcV10
+    Examples:
+      | dav-path |
+      | spaces   |
diff --git a/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature b/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature
index 30a49d64f475..0bce41e7cb09 100644
--- a/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature
+++ b/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature
@@ -81,6 +81,7 @@ Feature: update a public link share
   @issue-product-295 @skipOnOcV10
   Scenario Outline: API responds with a full set of parameters when owner renames the file with a public link
     Given using OCS API version "<ocs_api_version>"
+    And using <dav-path> DAV path
     And user "Alice" has created folder "FOLDER"
     When user "Alice" creates a public link share using the sharing API with settings
       | path | FOLDER |
@@ -113,9 +114,18 @@ Feature: update a public link share
       | mail_send                  | 0                    |
       | name                       |                      |
     Examples:
-      | ocs_api_version | ocs_status_code |
-      | 1               | 100             |
-      | 2               | 200             |
+      | dav-path | ocs_api_version | ocs_status_code |
+      | old      | 1               | 100             |
+      | old      | 2               | 200             |
+      | new      | 1               | 100             |
+      | new      | 2               | 200             |
+
+    @personalSpace
+    Examples:
+      | dav-path | ocs_api_version | ocs_status_code |
+      | spaces   | 1               | 100             |
+      | spaces   | 2               | 200             |
+
 
   Scenario Outline: Creating a new public link share with password and adding an expiration date using public API
     Given using OCS API version "<ocs_api_version>"
diff --git a/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature b/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature
index 5ae7e99ef745..fb7f006eab5b 100644
--- a/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature
+++ b/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature
@@ -41,7 +41,8 @@ Feature: upload to a public link share
       | path        | FOLDER |
       | permissions | create |
     When user "Alice" deletes file "/FOLDER" using the WebDAV API
-    Then uploading a file should not work using the <webdav_api_version> public WebDAV API
+    Then the HTTP status code should be "204"
+    And uploading a file should not work using the <webdav_api_version> public WebDAV API
     And the HTTP status code should be "404"
 
     @notToImplementOnOCIS @issue-ocis-2079
@@ -56,6 +57,11 @@ Feature: upload to a public link share
       | old      | new                |
       | new      | new                |
 
+    @personalSpace @skipOnOcV10
+    Examples:
+      | dav-path | webdav_api_version |
+      | spaces   | new                |
+
 
   Scenario Outline: Uploading file to a public read-only share folder with public API does not work
     When user "Alice" creates a public link share using the sharing API with settings