diff --git a/.drone.star b/.drone.star
index 7390b1fb745..18cedec92f1 100644
--- a/.drone.star
+++ b/.drone.star
@@ -61,6 +61,8 @@ config = {
       ],
       'phoenixWebUI7': [
         'webUISharingFilePermissionMultipleUsers',
+      ],
+      'phoenixWebUI8': [
         'webUISharingFolderPermissionMultipleUsers',
         'webUISharingFolderAdvancedPermissionMultipleUsers',
       ],
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature
deleted file mode 100644
index ee2c4cf43e5..00000000000
--- a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink1-createPublicLinkShare.feature
+++ /dev/null
@@ -1,31 +0,0 @@
-@api @files_sharing-app-required @public_link_share-feature-required @skipOnOcis-EOS-Storage @issue-ocis-reva-315 @issue-ocis-reva-316
-
-Feature: create a public link share
-
-  Background:
-    Given user "Alice" has been created with default attributes and without skeleton files
-
-  @issue-37605 @skipOnOcis-OCIS-Storage
-  # after fixing all issues make the oC10 scenario like this one, and delete this scenario
-  Scenario: Get the mtime of a file inside a folder shared by public link using new webDAV version (run on OCIS)
-    Given user "Alice" has created folder "testFolder"
-    And user "Alice" has created a public link share with settings
-      | path        | /testFolder               |
-      | permissions | read,update,create,delete |
-    When the public uploads file "file.txt" to the last shared folder with mtime "Thu, 08 Aug 2019 04:18:13 GMT" using the new public WebDAV API
-    Then as "Alice" file "testFolder/file.txt" should exist
-    And as "Alice" the mtime of the file "testFolder/file.txt" should be "Thu, 08 Aug 2019 04:18:13 GMT"
-    And the mtime of file "file.txt" in the last shared public link using the WebDAV API should be "Thu, 08 Aug 2019 04:18:13 GMT"
-
-  @issue-37605 @skipOnOcis-OCIS-Storage
-  # after fixing all issues make the oC10 scenario like this one, and delete this scenario
-  Scenario: overwriting a file changes its mtime (new public webDAV API) (run on OCIS)
-    Given user "Alice" has created folder "testFolder"
-    When user "Alice" uploads file with content "uploaded content for file name ending with a dot" to "testFolder/file.txt" using the WebDAV API
-    And user "Alice" has created a public link share with settings
-      | path        | /testFolder               |
-      | permissions | read,update,create,delete |
-    And the public uploads file "file.txt" to the last shared folder with mtime "Thu, 08 Aug 2019 04:18:13 GMT" using the new public WebDAV API
-    Then as "Alice" file "/testFolder/file.txt" should exist
-    And as "Alice" the mtime of the file "testFolder/file.txt" should be "Thu, 08 Aug 2019 04:18:13 GMT"
-    And the mtime of file "file.txt" in the last shared public link using the WebDAV API should be "Thu, 08 Aug 2019 04:18:13 GMT"
diff --git a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-updatePublicLinkShare.feature b/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-updatePublicLinkShare.feature
deleted file mode 100644
index e14ed5e6aff..00000000000
--- a/ocis/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-updatePublicLinkShare.feature
+++ /dev/null
@@ -1,47 +0,0 @@
-@api @files_sharing-app-required @public_link_share-feature-required @issue-ocis-reva-252
-Feature: update a public link share
-
-  Background:
-    Given using OCS API version "1"
-    And user "Alice" has been created with default attributes and skeleton files
-
-  @issue-ocis-reva-243 @issue-ocis-reva-349 @issue-37653
-  # after fixing all issues delete this Scenario and use the one from oC10 core
-  Scenario Outline: API responds with a full set of parameters when owner changes the expireDate of a public share
-    Given using OCS API version "<ocs_api_version>"
-    When user "Alice" creates a public link share using the sharing API with settings
-      | path | FOLDER |
-    And user "Alice" updates the last share using the sharing API with
-      | expireDate | +3 days |
-    Then the OCS status code should be "<ocs_status_code>"
-    And the OCS status message should be "OK"
-    And the HTTP status code should be "200"
-    And the fields of the last response to user "Alice" should include
-      | id                         | A_STRING             |
-      | share_type                 | public_link          |
-      | uid_owner                  | %username%           |
-      | displayname_owner          | %displayname%        |
-      | permissions                | read                 |
-      | stime                      | A_NUMBER             |
-      | parent                     |                      |
-      | expiration                 | A_STRING             |
-      | token                      | A_STRING             |
-      | uid_file_owner             | %username%           |
-      | displayname_file_owner     | %displayname%        |
-      | additional_info_owner      |                      |
-      | additional_info_file_owner |                      |
-      | state                      | 0                    |
-      | item_type                  | folder               |
-      | item_source                | A_STRING             |
-      | path                       | /FOLDER              |
-      | mimetype                   | httpd/unix-directory |
-      | storage_id                 | A_STRING             |
-      | storage                    | A_NUMBER             |
-      | file_source                | A_STRING             |
-      | file_target                | /FOLDER              |
-      | mail_send                  | 0                    |
-      | name                       |                      |
-    Examples:
-      | ocs_api_version | ocs_status_code |
-      | 1               | 100             |
-      | 2               | 200             |