diff --git a/.drone.star b/.drone.star
index 558de29a2d..88a1a2ab9b 100644
--- a/.drone.star
+++ b/.drone.star
@@ -17,7 +17,7 @@ config = {
   },
   'apiTests': {
     'coreBranch': 'master',
-    'coreCommit': '592d76b63254767ac17414475c37b48668a517b8',
+    'coreCommit': 'ed326fd54c7f9142389e49aad87653a905c6ddb7',
     'numberOfParts': 10
   },
   'uiTests': {
diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml
index e7e2025b7a..bb33b728d7 100644
--- a/tests/acceptance/config/behat.yml
+++ b/tests/acceptance/config/behat.yml
@@ -44,6 +44,7 @@ default:
         - PublicWebDavContext:
         - TrashbinContext:
         - WebDavPropertiesContext:
+        - TUSContext:
 
   extensions:
     jarnaiz\JUnitFormatter\JUnitFormatterExtension:
diff --git a/tests/acceptance/expected-failures-on-OCIS-storage.txt b/tests/acceptance/expected-failures-on-OCIS-storage.txt
index 0cf7979f4f..00d3b44572 100644
--- a/tests/acceptance/expected-failures-on-OCIS-storage.txt
+++ b/tests/acceptance/expected-failures-on-OCIS-storage.txt
@@ -2502,3 +2502,7 @@ apiWebdavUploadTUS/uploadToShare.feature:67
 # https://github.com/owncloud/product/issues/293 sharing with group not available
 apiWebdavUploadTUS/uploadToShare.feature:52
 apiWebdavUploadTUS/uploadToShare.feature:53
+
+# https://github.com/owncloud/ocis/issues/1012 TUS OPTIONS requests does not reply with TUS headers when invalid password
+apiWebdavUploadTUS/optionsRequest.feature:29
+apiWebdavUploadTUS/optionsRequest.feature:40
diff --git a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
index 3118131ec2..c3b16148cd 100644
--- a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
+++ b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
@@ -2410,3 +2410,7 @@ apiVersions/fileVersionsSharingToShares.feature:279
 # https://github.com/owncloud/ocis/issues/719 when a share exists its impossible to share a renamed folder
 apiShareManagementBasicToShares/createShareToSharesFolder.feature:611
 apiShareManagementBasicToShares/createShareToSharesFolder.feature:612
+
+# https://github.com/owncloud/ocis/issues/1012 TUS OPTIONS requests does not reply with TUS headers when invalid password
+apiWebdavUploadTUS/optionsRequest.feature:29
+apiWebdavUploadTUS/optionsRequest.feature:40
diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavUploadTUS-optionsRequest.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavUploadTUS-optionsRequest.feature
new file mode 100644
index 0000000000..0a9156a6b3
--- /dev/null
+++ b/tests/acceptance/features/apiOcisSpecific/apiWebdavUploadTUS-optionsRequest.feature
@@ -0,0 +1,29 @@
+@api @issue-ocis-1012
+# after fixing all issues delete these Scenarios and use the one from oC10 core
+Feature: OPTIONS request
+
+  Background:
+    Given user "Alice" has been created with default attributes and without skeleton files
+
+  Scenario: send OPTIONS request to webDav endpoints using the TUS protocol with valid username and wrong password
+    When user "Alice" requests these endpoints with "OPTIONS" including body "doesnotmatter" using password "invalid" about user "Alice"
+      | endpoint                          |
+      | /remote.php/webdav/               |
+      | /remote.php/dav/files/%username%/ |
+    Then the following headers should not be set
+      | header        |
+      | Tus-Resumable |
+      | Tus-Version   |
+      | Tus-Extension |
+
+  Scenario: send OPTIONS requests to webDav endpoints using valid password and username of different user
+    Given user "Brian" has been created with default attributes and without skeleton files
+    When user "Brian" requests these endpoints with "OPTIONS" including body "doesnotmatter" using the password of user "Alice"
+      | endpoint                          |
+      | /remote.php/webdav/               |
+      | /remote.php/dav/files/%username%/ |
+    Then the following headers should not be set
+      | header        |
+      | Tus-Resumable |
+      | Tus-Version   |
+      | Tus-Extension |