diff --git a/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature b/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature
index 49cf4c1ae88..f558c828372 100644
--- a/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature
+++ b/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature
@@ -128,6 +128,7 @@ Feature: Share by public link
     When the public uses the webUI to access the last public link created by user "user1" with password "pass12"
     Then the public should not get access to the publicly shared file
 
+  @skipOnOCIS @issue-ocis-reva-389
   Scenario: user shares a public link with folder longer than 64 chars and shorter link name
     Given user "user1" has renamed folder "simple-folder" to "aquickbrownfoxjumpsoveraverylazydogaquickbrownfoxjumpsoveralazydog"
     And user "user1" has logged in using the webUI
@@ -583,6 +584,7 @@ Feature: Share by public link
     Then file "lorem.txt" with path "" should be listed in the shared with others page on the webUI
     And file "lorem.txt" with path "/simple-folder" should be listed in the shared with others page on the webUI
 
+  @skipOnOCIS @issue-ocis-reva-389
   Scenario: user removes the public link of a file using webUI
     Given user "user1" has logged in using the webUI
     And user "user1" has created a public link with following settings
@@ -592,6 +594,17 @@ Feature: Share by public link
     When the user removes the public link named "Public-link" of file "lorem.txt" using the webUI
     Then user "user1" should not have any public link
 
+  @skipOnOC10 @issue-ocis-reva-389
+  # After this issue is fixed delete this scenario and use the one above
+  Scenario: user removes the public link of a file using webUI
+    Given user "user1" has logged in using the webUI
+    And user "user1" has created a public link with following settings
+      | path        | lorem.txt   |
+      | name        | Public-link |
+      | permissions | read        |
+    When the user removes the public link named "Public-link" of file "lorem.txt" using the webUI
+    Then user "user1" should have some public shares
+
   @skip @yetToImplement
   Scenario: user cancel removes operation for the public link of a file
     Given the user has created a new public link for file "lorem.txt" using the webUI
@@ -897,16 +910,19 @@ Feature: Share by public link
       | name | Public Link Sub                    |
     And user "user1" has logged in using the webUI
     When the user browses to the shared-with-others page
-    And the user opens the link share dialog for folder "simple-empty-folder" using the webUI
-    Then a link named "Public Link" should not be listed on the webUI
-    And a link named "Public Link Sub" should not be listed on the webUI
+    Then the folder should be empty on the webUI
+#    And the user opens the link share dialog for folder "simple-empty-folder" using the webUI
+#    Then a link named "Public Link" should not be listed on the webUI
+#    And a link named "Public Link Sub" should not be listed on the webUI
 
+  @issue-ocis-reva-243 @skipOnOCIS
   Scenario: token is shown for links without a name
     When user "user1" has created a public link with following settings
       | path | /simple-folder |
     And user "user1" logs in using the webUI
     Then a public link with the last created link share token as name should be listed for resource "simple-folder" on the webUI
 
+  @issue-ocis-reva-243 @skipOnOCIS
   Scenario: User can create a public link via quick action
     Given user "user1" has logged in using the webUI
     When the user creates a public link via quick action for resource "simple-folder" using the webUI
diff --git a/tests/acceptance/stepDefinitions/publicLinkContext.js b/tests/acceptance/stepDefinitions/publicLinkContext.js
index ac76201adc4..b8a9078c5ec 100644
--- a/tests/acceptance/stepDefinitions/publicLinkContext.js
+++ b/tests/acceptance/stepDefinitions/publicLinkContext.js
@@ -83,6 +83,14 @@ Then('user {string} should not have any public link', async function(sharer) {
   assert.strictEqual(resp.length, 0, 'User has shares. Response: ' + resp)
 })
 
+Then('user {string} should have some public shares', async function(sharer) {
+  const publicShares = await sharingHelper.getAllPublicLinkShares(sharer)
+  console.log(publicShares)
+  if (publicShares.length === 0) {
+    assert.fail('Shares not found')
+  }
+})
+
 Then('the fields of the last public link share response of user {string} should include', function(
   linkCreator,
   dataTable