diff --git a/tests/acceptance/expected-failures-without-remotephp.md b/tests/acceptance/expected-failures-without-remotephp.md
index cb5d54900fc..b0004b7c363 100644
--- a/tests/acceptance/expected-failures-without-remotephp.md
+++ b/tests/acceptance/expected-failures-without-remotephp.md
@@ -195,6 +195,12 @@
 - [apiSpaces/publicLink.feature:28](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/publicLink.feature#L28)
 - [apiSpaces/publicLink.feature:34](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/publicLink.feature#L34)
 - [apiSpaces/publicLink.feature:40](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/publicLink.feature#L40)
+- [apiSpaces/uploadSpaces.feature:98](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/uploadSpaces.feature#L98)
+- [apiSpaces/uploadSpaces.feature:114](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/uploadSpaces.feature#L114)
+- [apiSpaces/uploadSpaces.feature:130](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/uploadSpaces.feature#L130)
+- [apiSpaces/shareUploadTUS.feature:407](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/shareUploadTUS.feature#L407)
+- [apiSpaces/shareUploadTUS.feature:422](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/shareUploadTUS.feature#L422)
+- [apiSpaces/shareUploadTUS.feature:439](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/shareUploadTUS.feature#L439)
 - [apiSpacesShares/shareSpacesViaLink.feature:61](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature#L61)
 - [apiDepthInfinity/propfind.feature:74](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiDepthInfinity/propfind.feature#L74)
 - [apiDepthInfinity/propfind.feature:124](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiDepthInfinity/propfind.feature#L124)
diff --git a/tests/acceptance/features/apiSpaces/uploadSpaces.feature b/tests/acceptance/features/apiSpaces/uploadSpaces.feature
index 9814aae2b4e..2a26e81f2db 100644
--- a/tests/acceptance/features/apiSpaces/uploadSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/uploadSpaces.feature
@@ -94,7 +94,7 @@ Feature: Upload files into a space
       | foo/bar     |
       | foo/bar/baz |
 
-  @issue-10649
+  @issue-10331 @issue-10649
   Scenario: public uploads a zero byte file to a public share folder
     Given using SharingNG
     And user "Alice" has created folder "/uploadFolder"
@@ -110,15 +110,15 @@ Feature: Upload files into a space
     And for user "Alice" folder "uploadFolder" of the space "Personal" should not contain these files:
       | textfile (1).txt |
 
-  @issue-10649
+  @issue-10331 @issue-10649
   Scenario: public uploads a zero byte file to a public share folder inside project space
     Given using SharingNG
     And user "Alice" has created a folder "/uploadFolder" in space "Project Ceres"
     And user "Alice" has created the following resource link share:
-      | resource        | uploadFolder |
-      | space           | Project Ceres     |
-      | permissionsRole | createOnly   |
-      | password        | %public%     |
+      | resource        | uploadFolder  |
+      | space           | Project Ceres |
+      | permissionsRole | createOnly    |
+      | password        | %public%      |
     When the public uploads file "filesForUpload/zerobyte.txt" to "textfile.txt" inside last link shared folder with password "%public%" using the public WebDAV API
     Then the HTTP status code should be "201"
     And for user "Alice" folder "uploadFolder" of the space "Project Ceres" should contain these files:
@@ -126,13 +126,13 @@ Feature: Upload files into a space
     And for user "Alice" folder "uploadFolder" of the space "Project Ceres" should not contain these files:
       | textfile (1).txt |
 
-  @issue-10649
+  @issue-10331 @issue-10649
   Scenario: public uploads a zero byte file to a public share project space
     Given using SharingNG
     And user "Alice" has created the following space link share:
-      | space           | Project Ceres  |
-      | permissionsRole | createOnly     |
-      | password        | %public% |
+      | space           | Project Ceres |
+      | permissionsRole | createOnly    |
+      | password        | %public%      |
     When the public uploads file "filesForUpload/zerobyte.txt" to "textfile.txt" inside last link shared folder with password "%public%" using the public WebDAV API
     Then the HTTP status code should be "201"
     And for user "Alice" the space "Project Ceres" should contain these files:
diff --git a/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature b/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature
index e166256b095..af70bfaa1ff 100644
--- a/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature
+++ b/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature
@@ -403,7 +403,7 @@ Feature: upload resources on share using TUS protocol
     Then the HTTP status code should be "460"
     And for user "Alice" the content of the file "/textFile.txt" of the space "Personal" should be "original content"
 
-  @issue-10649
+  @issue-10331 @issue-10649
   Scenario: public uploads a zero byte file to a public share folder
     Given using SharingNG
     And user "Alice" has created folder "/uploadFolder"
@@ -418,7 +418,7 @@ Feature: upload resources on share using TUS protocol
     And for user "Alice" folder "uploadFolder" of the space "Personal" should not contain these files:
       | textfile (1).txt |
 
-  @issue-10649
+  @issue-10331 @issue-10649
   Scenario: public uploads a zero-byte file to a shared folder inside project space
     Given using SharingNG
     And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API
@@ -426,7 +426,7 @@ Feature: upload resources on share using TUS protocol
     And user "Alice" has created a folder "/uploadFolder" in space "Project"
     And user "Alice" has created the following resource link share:
       | resource        | uploadFolder |
-      | space           | Project     |
+      | space           | Project      |
       | permissionsRole | createOnly   |
       | password        | %public%     |
     When the public uploads a file from "filesForUpload/zerobyte.txt" to "textfile.txt" via TUS inside last link shared folder with password "%public%" using the WebDAV API
@@ -435,7 +435,7 @@ Feature: upload resources on share using TUS protocol
     And for user "Alice" folder "uploadFolder" of the space "Project" should not contain these files:
       | textfile (1).txt |
 
-  @issue-10649
+  @issue-10331 @issue-10649
   Scenario: public uploads a zero-byte file to a public share project space
     Given using SharingNG
     And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API