diff --git a/ocis/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml
similarity index 100%
rename from ocis/tests/acceptance/config/behat.yml
rename to tests/acceptance/config/behat.yml
diff --git a/ocis/tests/acceptance/expected-failures-on-EOS-storage.txt b/tests/acceptance/expected-failures-on-EOS-storage.txt
similarity index 100%
rename from ocis/tests/acceptance/expected-failures-on-EOS-storage.txt
rename to tests/acceptance/expected-failures-on-EOS-storage.txt
diff --git a/ocis/tests/acceptance/expected-failures-on-OCIS-storage.txt b/tests/acceptance/expected-failures-on-OCIS-storage.txt
similarity index 100%
rename from ocis/tests/acceptance/expected-failures-on-OCIS-storage.txt
rename to tests/acceptance/expected-failures-on-OCIS-storage.txt
diff --git a/ocis/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
similarity index 100%
rename from ocis/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
rename to tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
diff --git a/ocis/tests/acceptance/features/apiBasic/addUser.feature b/tests/acceptance/features/apiBasic/addUser.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiBasic/addUser.feature
rename to tests/acceptance/features/apiBasic/addUser.feature
diff --git a/ocis/tests/acceptance/features/apiBasic/createShareToSharesFolder.feature b/tests/acceptance/features/apiBasic/createShareToSharesFolder.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiBasic/createShareToSharesFolder.feature
rename to tests/acceptance/features/apiBasic/createShareToSharesFolder.feature
diff --git a/ocis/tests/acceptance/features/apiBasic/uploadFile.feature b/tests/acceptance/features/apiBasic/uploadFile.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiBasic/uploadFile.feature
rename to tests/acceptance/features/apiBasic/uploadFile.feature
diff --git a/ocis/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature b/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature
rename to tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature
rename to tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature
rename to tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature
rename to tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature
rename to tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature
rename to tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature
rename to tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature
rename to tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavPROPFINDAuth.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature b/tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature
rename to tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiFavorites-favorites.feature b/tests/acceptance/features/apiOcisSpecific/apiFavorites-favorites.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiFavorites-favorites.feature
rename to tests/acceptance/features/apiOcisSpecific/apiFavorites-favorites.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiMain-checksums.feature b/tests/acceptance/features/apiOcisSpecific/apiMain-checksums.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiMain-checksums.feature
rename to tests/acceptance/features/apiOcisSpecific/apiMain-checksums.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiMain-main.feature b/tests/acceptance/features/apiOcisSpecific/apiMain-main.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiMain-main.feature
rename to tests/acceptance/features/apiOcisSpecific/apiMain-main.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature b/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature
rename to tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature b/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature
rename to tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareOperations-getWebDAVSharePermissions.feature b/tests/acceptance/features/apiOcisSpecific/apiShareOperations-getWebDAVSharePermissions.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareOperations-getWebDAVSharePermissions.feature
rename to tests/acceptance/features/apiOcisSpecific/apiShareOperations-getWebDAVSharePermissions.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature b/tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature
rename to tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature b/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature
rename to tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-uploadToPublicLinkShare.feature b/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-uploadToPublicLinkShare.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-uploadToPublicLinkShare.feature
rename to tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-uploadToPublicLinkShare.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature b/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature
rename to tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiShareWebdavOperations-propfind.feature b/tests/acceptance/features/apiOcisSpecific/apiShareWebdavOperations-propfind.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiShareWebdavOperations-propfind.feature
rename to tests/acceptance/features/apiOcisSpecific/apiShareWebdavOperations-propfind.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature b/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature
rename to tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature b/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature
rename to tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-downloadFile.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-downloadFile.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-downloadFile.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-downloadFile.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-setFileProperties.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-setFileProperties.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-setFileProperties.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-setFileProperties.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature
similarity index 100%
rename from ocis/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature
rename to tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature
diff --git a/ocis/tests/acceptance/features/bootstrap/RevaContext.php b/tests/acceptance/features/bootstrap/RevaContext.php
similarity index 100%
rename from ocis/tests/acceptance/features/bootstrap/RevaContext.php
rename to tests/acceptance/features/bootstrap/RevaContext.php
diff --git a/ocis/tests/acceptance/features/bootstrap/bootstrap.php b/tests/acceptance/features/bootstrap/bootstrap.php
similarity index 100%
rename from ocis/tests/acceptance/features/bootstrap/bootstrap.php
rename to tests/acceptance/features/bootstrap/bootstrap.php
diff --git a/ocis/tests/config/drone/identifier-registration.yml b/tests/config/drone/identifier-registration.yml
similarity index 100%
rename from ocis/tests/config/drone/identifier-registration.yml
rename to tests/config/drone/identifier-registration.yml
diff --git a/ocis/tests/config/drone/ocis-config.json b/tests/config/drone/ocis-config.json
similarity index 100%
rename from ocis/tests/config/drone/ocis-config.json
rename to tests/config/drone/ocis-config.json