diff --git a/.drone.env b/.drone.env
index 28837e9036..44d3f61f8c 100644
--- a/.drone.env
+++ b/.drone.env
@@ -1,7 +1,7 @@
 # The test runner source for API tests
-CORE_COMMITID=32f41e237657ea93b341321a4e3c6e4644b57c13
+CORE_COMMITID=83017e5dffa5b770f77d64b3150f922e91a2269d
 CORE_BRANCH=master
 
 # The test runner source for UI tests
-WEB_COMMITID=be075d4a806673a0dd2a93e5f0d8f13516a39a34
+WEB_COMMITID=13e9d9a1bcb9ca6f25402580e909521fbee5d488
 WEB_BRANCH=master
diff --git a/.drone.star b/.drone.star
index 2b4bba6cfd..177c8e12d6 100644
--- a/.drone.star
+++ b/.drone.star
@@ -514,7 +514,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = 'owncloud'
           'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-%s-Storage' % ('OC' if storage == 'owncloud' else 'OCIS'),
           'DIVIDE_INTO_NUM_PARTS': number_of_parts,
           'RUN_PART': part_number,
-          'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures-on-%s-storage.txt' % (storage.upper()),
+          'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures-API-on-%s-storage.txt' % (storage.upper()),
         },
         'commands': [
           'make -C /srv/app/testrunner test-acceptance-api',
@@ -621,6 +621,7 @@ def uiTestPipeline(ctx, suiteName, storage = 'owncloud', accounts_hash_difficult
           'LOCAL_UPLOAD_DIR': '/uploads',
           'NODE_TLS_REJECT_UNAUTHORIZED': 0,
           'TEST_PATHS': paths,
+          'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures-webUI-on-%s-storage.txt' % (storage.upper()),
         },
         'commands': [
           'source /drone/src/.drone.env',
@@ -630,7 +631,7 @@ def uiTestPipeline(ctx, suiteName, storage = 'owncloud', accounts_hash_difficult
           'git checkout $WEB_COMMITID',
           'cp -r tests/acceptance/filesForUpload/* /uploads',
           'yarn install-all',
-          'yarn run acceptance-tests-drone'
+          './tests/acceptance/run.sh'
         ],
         'volumes':
           [stepVolumeOC10Tests] +
diff --git a/tests/acceptance/docker/src/run-tests.sh b/tests/acceptance/docker/src/run-tests.sh
index 44695326a7..0f429ed2dc 100644
--- a/tests/acceptance/docker/src/run-tests.sh
+++ b/tests/acceptance/docker/src/run-tests.sh
@@ -32,14 +32,14 @@ then
         export DELETE_USER_DATA_CMD=''
         export BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OC-Storage'
         export OCIS_SKELETON_STRATEGY='copy'
-        export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt'
+        export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.txt'
     elif [ "$STORAGE" = "ocis" ]
     then
         export OCIS_REVA_DATA_ROOT=''
         export DELETE_USER_DATA_CMD='rm -rf /srv/app/tmp/ocis/storage/users/nodes/root/* /srv/app/tmp/ocis/storage/users/nodes/*-*-*-*'
         export BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage'
         export OCIS_SKELETON_STRATEGY='upload'
-        export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-on-OCIS-storage.txt'
+        export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OCIS-storage.txt'
     else
         echo "non existing STORAGE selected"
         exit 1
diff --git a/tests/acceptance/expected-failures-on-EOS-storage.txt b/tests/acceptance/expected-failures-API-on-EOS-storage.txt
similarity index 100%
rename from tests/acceptance/expected-failures-on-EOS-storage.txt
rename to tests/acceptance/expected-failures-API-on-EOS-storage.txt
diff --git a/tests/acceptance/expected-failures-on-OCIS-storage.txt b/tests/acceptance/expected-failures-API-on-OCIS-storage.txt
similarity index 99%
rename from tests/acceptance/expected-failures-on-OCIS-storage.txt
rename to tests/acceptance/expected-failures-API-on-OCIS-storage.txt
index c9874c13cd..1bd1ca00d6 100644
--- a/tests/acceptance/expected-failures-on-OCIS-storage.txt
+++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.txt
@@ -1203,6 +1203,14 @@ apiWebdavOperations/downloadFile.feature:72
 apiWebdavOperations/downloadFile.feature:73
 apiWebdavOperations/downloadFile.feature:84
 apiWebdavOperations/downloadFile.feature:85
+apiWebdavOperations/downloadFile.feature:144
+apiWebdavOperations/downloadFile.feature:145
+apiWebdavOperations/downloadFile.feature:179
+apiWebdavOperations/downloadFile.feature:180
+apiWebdavOperations/downloadFile.feature:189
+apiWebdavOperations/downloadFile.feature:190
+apiWebdavOperations/downloadFile.feature:198
+apiWebdavOperations/downloadFile.feature:199
 apiWebdavOperations/refuseAccess.feature:21
 apiWebdavOperations/refuseAccess.feature:22
 #
diff --git a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.txt
similarity index 99%
rename from tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
rename to tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.txt
index 1d886fd08f..20e7f8b675 100644
--- a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
+++ b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.txt
@@ -1171,6 +1171,14 @@ apiWebdavOperations/downloadFile.feature:72
 apiWebdavOperations/downloadFile.feature:73
 apiWebdavOperations/downloadFile.feature:84
 apiWebdavOperations/downloadFile.feature:85
+apiWebdavOperations/downloadFile.feature:144
+apiWebdavOperations/downloadFile.feature:145
+apiWebdavOperations/downloadFile.feature:179
+apiWebdavOperations/downloadFile.feature:180
+apiWebdavOperations/downloadFile.feature:189
+apiWebdavOperations/downloadFile.feature:190
+apiWebdavOperations/downloadFile.feature:198
+apiWebdavOperations/downloadFile.feature:199
 apiWebdavOperations/refuseAccess.feature:21
 apiWebdavOperations/refuseAccess.feature:22
 #
diff --git a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt
new file mode 100644
index 0000000000..1e02037184
--- /dev/null
+++ b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt
@@ -0,0 +1,9 @@
+# this file contains the scenarios from web UI tests that are currently expected to fail
+#
+# https://github.com/owncloud/ocisissues/1106 media viewer does not support mp3 files
+webUIPreview/imageMediaViewer.feature:70
+webUIPreview/imageMediaViewer.feature:76
+#
+# https://github.com/owncloud/web/issues/4564 authentication dialog appears when user is deleted
+# https://github.com/owncloud/ocis/issues/1129 login error page loops when logged in user is deleted
+webUILogin/login.feature:59