diff --git a/.drone.env b/.drone.env
index ce3cc29393..87781e034c 100644
--- a/.drone.env
+++ b/.drone.env
@@ -1,4 +1,4 @@
 # The test runner source for API tests
-APITESTS_COMMITID=6866f5a664891bbb04316584a788edb4777e5f44
+APITESTS_COMMITID=e22c3556416b35bfaf6ecce875d8c11ac9f48116
 APITESTS_BRANCH=master
 APITESTS_REPO_GIT_URL=https://github.com/owncloud/ocis.git
diff --git a/tests/acceptance/expected-failures-on-POSIX-storage.md b/tests/acceptance/expected-failures-on-POSIX-storage.md
index 6828d460ab..c76c4b332e 100644
--- a/tests/acceptance/expected-failures-on-POSIX-storage.md
+++ b/tests/acceptance/expected-failures-on-POSIX-storage.md
@@ -217,34 +217,34 @@ _The below features have been added after I last categorized them. AFAICT they a
 - [coreApiWebdavUploadTUS/uploadFile.feature:123](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L123)
 - [coreApiWebdavUploadTUS/uploadFile.feature:124](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L124)
 - [coreApiWebdavUploadTUS/uploadFile.feature:148](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L148)
-- [coreApiVersions/fileVersions.feature:46](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L46)
-- [coreApiVersions/fileVersions.feature:47](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L47)
-- [coreApiVersions/fileVersions.feature:48](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L48)
-- [coreApiVersions/fileVersions.feature:61](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L61)
-- [coreApiVersions/fileVersions.feature:62](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L62)
-- [coreApiVersions/fileVersions.feature:63](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L63)
+- [coreApiVersions/fileVersions.feature:43](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L43)
+- [coreApiVersions/fileVersions.feature:44](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L44)
+- [coreApiVersions/fileVersions.feature:45](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L45)
+- [coreApiVersions/fileVersions.feature:56](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L56)
+- [coreApiVersions/fileVersions.feature:57](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L57)
+- [coreApiVersions/fileVersions.feature:58](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L58)
+- [coreApiVersions/fileVersions.feature:72](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L72)
+- [coreApiVersions/fileVersions.feature:73](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L73)
+- [coreApiVersions/fileVersions.feature:74](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L74)
 - [coreApiVersions/fileVersions.feature:77](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L77)
-- [coreApiVersions/fileVersions.feature:78](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L78)
-- [coreApiVersions/fileVersions.feature:79](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L79)
-- [coreApiVersions/fileVersions.feature:82](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L82)
-- [coreApiVersions/fileVersions.feature:91](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L91)
-- [coreApiVersions/fileVersions.feature:100](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L100)
-- [coreApiVersions/fileVersions.feature:111](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L111)
-- [coreApiVersions/fileVersions.feature:147](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L147)
-- [coreApiVersions/fileVersions.feature:156](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L156)
-- [coreApiVersions/fileVersions.feature:175](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L175)
-- [coreApiVersions/fileVersions.feature:185](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L185)
-- [coreApiVersions/fileVersions.feature:203](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L203)
-- [coreApiVersions/fileVersions.feature:262](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L262)
-- [coreApiVersions/fileVersions.feature:286](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L286)
-- [coreApiVersions/fileVersions.feature:287](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L287)
-- [coreApiVersions/fileVersions.feature:288](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L288)
+- [coreApiVersions/fileVersions.feature:86](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L86)
+- [coreApiVersions/fileVersions.feature:95](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L95)
+- [coreApiVersions/fileVersions.feature:106](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L106)
+- [coreApiVersions/fileVersions.feature:142](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L142)
+- [coreApiVersions/fileVersions.feature:151](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L151)
+- [coreApiVersions/fileVersions.feature:170](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L170)
+- [coreApiVersions/fileVersions.feature:180](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L180)
+- [coreApiVersions/fileVersions.feature:198](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L198)
+- [coreApiVersions/fileVersions.feature:257](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L257)
+- [coreApiVersions/fileVersions.feature:281](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L281)
+- [coreApiVersions/fileVersions.feature:282](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L282)
+- [coreApiVersions/fileVersions.feature:283](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L283)
+- [coreApiVersions/fileVersions.feature:296](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L296)
+- [coreApiVersions/fileVersions.feature:297](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L297)
+- [coreApiVersions/fileVersions.feature:298](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L298)
 - [coreApiVersions/fileVersions.feature:301](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L301)
-- [coreApiVersions/fileVersions.feature:302](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L302)
-- [coreApiVersions/fileVersions.feature:303](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L303)
-- [coreApiVersions/fileVersions.feature:306](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L306)
-- [coreApiVersions/fileVersions.feature:529](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L529)
-- [coreApiVersions/fileVersions.feature:543](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L543)
+- [coreApiVersions/fileVersions.feature:524](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L524)
+- [coreApiVersions/fileVersions.feature:538](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L538)
 - [coreApiWebdavMove2/moveFile.feature:41](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature#L41)
 - [coreApiWebdavMove2/moveFile.feature:42](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature#L42)
 - [coreApiWebdavMove2/moveFile.feature:43](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature#L43)