diff --git a/tests/acceptance/expected-failures-on-OCIS-storage.txt b/tests/acceptance/expected-failures-on-OCIS-storage.txt
index 74bb5f761cc..1b03f286cbd 100644
--- a/tests/acceptance/expected-failures-on-OCIS-storage.txt
+++ b/tests/acceptance/expected-failures-on-OCIS-storage.txt
@@ -1269,7 +1269,6 @@ apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:19
 apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:35
 apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:36
 apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:37
-apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:40
 #
 # https://github.com/owncloud/ocis-reva/issues/56 remote.php/dav/uploads endpoint does not exist
 #
@@ -1287,7 +1286,6 @@ apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:20
 apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:37
 apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:38
 apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:39
-apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:42
 #
 # https://github.com/owncloud/ocis-reva/issues/56 remote.php/dav/uploads endpoint does not exist
 #
@@ -1308,12 +1306,7 @@ apiWebdavUpload2/uploadFileUsingNewChunking.feature:158
 #
 # https://github.com/owncloud/ocis-reva/issues/17  uploading with old-chunking does not work
 #
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:13
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:25
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:34
 apiWebdavUpload2/uploadFileUsingOldChunking.feature:43
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:75
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:76
 apiWebdavUpload2/uploadFileUsingOldChunking.feature:96
 apiWebdavUpload2/uploadFileUsingOldChunking.feature:97
 apiWebdavUpload2/uploadFileUsingOldChunking.feature:98
diff --git a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
index b5bb50933dc..558a989100b 100644
--- a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
+++ b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
@@ -1250,22 +1250,15 @@ apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:19
 apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:35
 apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:36
 apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:37
-apiWebdavUpload2/uploadFileToBlacklistedNameUsingOldChunking.feature:40
 apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:13
 apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:20
 apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:37
 apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:38
 apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:39
-apiWebdavUpload2/uploadFileToExcludedDirectoryUsingOldChunking.feature:42
 #
 # https://github.com/owncloud/ocis-reva/issues/17  uploading with old-chunking does not work
 #
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:13
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:25
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:34
 apiWebdavUpload2/uploadFileUsingOldChunking.feature:43
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:75
-apiWebdavUpload2/uploadFileUsingOldChunking.feature:76
 apiWebdavUpload2/uploadFileUsingOldChunking.feature:96
 apiWebdavUpload2/uploadFileUsingOldChunking.feature:97
 apiWebdavUpload2/uploadFileUsingOldChunking.feature:98
diff --git a/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature b/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature
index c9e08b63505..212a0e4ae65 100644
--- a/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature
+++ b/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature
@@ -12,9 +12,9 @@ Feature: dav-versions
   Scenario: Upload file and no version is available using various chunking methods
     When user "Alice" uploads file "filesForUpload/davtest.txt" to filenames based on "/davtest.txt" with all mechanisms using the WebDAV API
     Then the version folder of file "/davtest.txt-olddav-regular" for user "Alice" should contain "0" elements
-    Then the version folder of file "/davtest.txt-newdav-regular" for user "Alice" should contain "0" elements
-    And as "Alice" file "/davtest.txt-olddav-oldchunking" should not exist
-    And as "Alice" file "/davtest.txt-newdav-newchunking" should not exist
+    And the version folder of file "/davtest.txt-newdav-regular" for user "Alice" should contain "0" elements
+    And the version folder of file "/davtest.txt-olddav-oldchunking" for user "Alice" should contain "0" elements
+    And as "Alice" file "/davtest.txt-olddav-newchunking" should not exist
 
   @issue-ocis-reva-17 @issue-ocis-reva-56 @skipOnOcis-OCIS-Storage
   # after fixing all issues delete this Scenario and use the one from oC10 core
@@ -23,7 +23,7 @@ Feature: dav-versions
     And user "Alice" uploads file "filesForUpload/davtest.txt" to filenames based on "/davtest.txt" with all mechanisms using the WebDAV API
     Then the version folder of file "/davtest.txt-olddav-regular" for user "Alice" should contain "1" element
     And the version folder of file "/davtest.txt-newdav-regular" for user "Alice" should contain "1" element
-    And as "Alice" file "/davtest.txt-olddav-oldchunking" should not exist
+    And the version folder of file "/davtest.txt-olddav-oldchunking" for user "Alice" should contain "1" element
     And as "Alice" file "/davtest.txt-newdav-newchunking" should not exist
 
   @files_sharing-app-required