diff --git a/tests/acceptance/features/apiWebdavUpload1/uploadFile.feature b/tests/acceptance/features/apiWebdavUpload1/uploadFile.feature
index ad40b4ce99c5..1599bb5c0d4a 100644
--- a/tests/acceptance/features/apiWebdavUpload1/uploadFile.feature
+++ b/tests/acceptance/features/apiWebdavUpload1/uploadFile.feature
@@ -20,16 +20,19 @@ Feature: upload file
       | old         | /upload.txt       |
       | old         | /नेपाली.txt       |
       | old         | /strängé file.txt |
+      | old         | /s,a,m,p,l,e.txt  |
       | new         | /upload.txt       |
-      | new         | /strängé file.txt |
       | new         | /नेपाली.txt       |
-      | old         | /s,a,m,p,l,e.txt  |
+      | new         | /strängé file.txt |
       | new         | /s,a,m,p,l,e.txt  |
 
     @skipOnOcV10 @personalSpace
     Examples:
-      | dav_version | file_name   |
-      | spaces      | /upload.txt |
+      | dav_version | file_name         |
+      | spaces      | /upload.txt       |
+      | spaces      | /नेपाली.txt       |
+      | spaces      | /strängé file.txt |
+      | spaces      | /s,a,m,p,l,e.txt  |
 
 
   Scenario Outline: upload a file and check download content
@@ -43,6 +46,12 @@ Feature: upload file
       | new         | "C++ file.cpp" |
       | new         | "file #2.txt"  |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version | file_name      |
+      | spaces      | "C++ file.cpp" |
+      | spaces      | "file #2.txt"  |
+
   @issue-ocis-reva-265
   #after fixing all issues delete this Scenario and merge with the one above
   Scenario Outline: upload a file and check download content
@@ -58,6 +67,13 @@ Feature: upload file
       | new         | " ?fi=le&%#2 . txt" |
       | new         | " # %ab ab?=ed "    |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version | file_name           |
+      | spaces      | "file ?2.txt"       |
+      | spaces      | " ?fi=le&%#2 . txt" |
+      | spaces      | " # %ab ab?=ed "    |
+
 
   Scenario Outline: upload a file with comma in the filename and check download content
     Given using <dav_version> DAV path
@@ -72,6 +88,13 @@ Feature: upload file
       | new         | ",,,.txt"      |
       | new         | ",,,.,"        |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version | file_name      |
+      | spaces      | "sample,1.txt" |
+      | spaces      | ",,,.txt"      |
+      | spaces      | ",,,.,"        |
+
 
   Scenario Outline: upload a file into a folder and check download content
     Given using <dav_version> DAV path
@@ -91,6 +114,15 @@ Feature: upload file
       | new         | /नेपाली                          | नेपाली                        |
       | new         | /folder #2.txt                   | file #2.txt                   |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version | folder_name     | file_name        |
+      | spaces      | /strängé folder | strängé file.txt |
+      | spaces      | /upload         | abc.txt          |
+      | spaces      | /C++ folder     | C++ file.cpp     |
+      | spaces      | /नेपाली         | नेपाली           |
+      | spaces      | /folder #2.txt  | file #2.txt      |
+
   @issue-ocis-reva-265
     #after fixing all issues delete this Scenario and merge with the one above
   Scenario Outline: upload a file into a folder and check download content
@@ -105,6 +137,12 @@ Feature: upload file
       | new         | /folder ?2.txt    | file ?2.txt  |
       | new         | /?fi=le&%#2 . txt | # %ab ab?=ed |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version | folder_name       | file_name    |
+      | spaces      | /folder ?2.txt    | file ?2.txt  |
+      | spaces      | /?fi=le&%#2 . txt | # %ab ab?=ed |
+
   @skipOnOcV10.3 @skipOnOcV10.4 @skipOnOcV10.5
   Scenario Outline: attempt to upload a file into a nonexistent folder
     Given using <dav_version> DAV path
@@ -117,6 +155,11 @@ Feature: upload file
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @issue-ocis-reva-15
   Scenario Outline: Uploading file to path with extension .part should not be possible
     Given using <dav_version> DAV path
@@ -132,6 +175,11 @@ Feature: upload file
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
 
   Scenario Outline: upload a file into a folder with dots in the path and check download content
     Given using <dav_version> DAV path
@@ -153,6 +201,15 @@ Feature: upload file
       | new         | /upload...1.. | abc...txt.. |
       | new         | /...          | ...         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version | folder_name   | file_name   |
+      | spaces      | /upload.      | abc.        |
+      | spaces      | /upload.      | abc .       |
+      | spaces      | /upload.1     | abc.txt     |
+      | spaces      | /upload...1.. | abc...txt.. |
+      | spaces      | /...          | ...         |
+
   @issue-ocis-reva-174
   Scenario Outline: upload file with mtime
     Given using <dav_version> DAV path
@@ -165,6 +222,11 @@ Feature: upload file
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @issue-ocis-reva-174
   Scenario Outline: upload a file with mtime in a folder
     Given using <dav_version> DAV path
@@ -178,6 +240,11 @@ Feature: upload file
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @issue-ocis-reva-174
   Scenario Outline: moving a file does not change its mtime
     Given using <dav_version> DAV path
@@ -192,6 +259,11 @@ Feature: upload file
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @issue-ocis-reva-174
   Scenario Outline: overwriting a file changes its mtime
     Given using <dav_version> DAV path
@@ -205,6 +277,12 @@ Feature: upload file
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
+
   Scenario Outline: upload a hidden file and check download content
     Given using <dav_version> DAV path
     And user "Alice" has created folder "/FOLDER"
@@ -224,4 +302,9 @@ Feature: upload file
     Examples:
       | dav_version |
       | old         |
-      | new         |
\ No newline at end of file
+      | new         |
+
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
\ No newline at end of file
diff --git a/tests/acceptance/features/apiWebdavUpload1/uploadFileToBlacklistedName.feature b/tests/acceptance/features/apiWebdavUpload1/uploadFileToBlacklistedName.feature
index 0b15987868af..33aceaae519a 100644
--- a/tests/acceptance/features/apiWebdavUpload1/uploadFileToBlacklistedName.feature
+++ b/tests/acceptance/features/apiWebdavUpload1/uploadFileToBlacklistedName.feature
@@ -31,6 +31,11 @@ Feature: users cannot upload a file to a blacklisted name
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcV10.3
   @issue-ocis-reva-54
   Scenario Outline: upload a file to a filename that matches (or not) blacklisted_files_regex
@@ -65,3 +70,8 @@ Feature: users cannot upload a file to a blacklisted name
       | dav_version |
       | old         |
       | new         |
+
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
diff --git a/tests/acceptance/features/apiWebdavUpload1/uploadFileToExcludedDirectory.feature b/tests/acceptance/features/apiWebdavUpload1/uploadFileToExcludedDirectory.feature
index 5cfd1b55138a..13a1a1356fb5 100644
--- a/tests/acceptance/features/apiWebdavUpload1/uploadFileToExcludedDirectory.feature
+++ b/tests/acceptance/features/apiWebdavUpload1/uploadFileToExcludedDirectory.feature
@@ -20,6 +20,11 @@ Feature: users cannot upload a file to or into an excluded directory
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @issue-ocis-reva-54
   Scenario Outline: upload a file to an excluded directory name inside a parent directory
     Given using <dav_version> DAV path
@@ -34,6 +39,11 @@ Feature: users cannot upload a file to or into an excluded directory
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcV10.3
   @issue-ocis-reva-54
   Scenario Outline: upload a file to a filename that matches (or not) excluded_directories_regex
@@ -70,3 +80,8 @@ Feature: users cannot upload a file to or into an excluded directory
       | dav_version |
       | old         |
       | new         |
+
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
diff --git a/tests/acceptance/features/bootstrap/WebDav.php b/tests/acceptance/features/bootstrap/WebDav.php
index 9ac5def2de02..2a5fbae43c84 100644
--- a/tests/acceptance/features/bootstrap/WebDav.php
+++ b/tests/acceptance/features/bootstrap/WebDav.php
@@ -2922,7 +2922,8 @@ public function userUploadsFileToWithMtimeUsingTheWebdavApi(
 			$this->acceptanceTestsDirLocation() . $source,
 			$destination,
 			$this->getStepLineRef(),
-			["X-OC-Mtime" => $mtime]
+			["X-OC-Mtime" => $mtime],
+			$this->getDavPathVersion()
 		);
 	}