diff --git a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature
index f8bc8ad5ef..ea437133d7 100644
--- a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature
@@ -413,3 +413,21 @@ Feature: create a public link share
       | d:href       |
     Then the HTTP status code should be "207"
     And the value of the item "//d:href" in the response should match "/%base_path%\/remote.php\/dav\/public-files\/%public_token%\/file.txt$/"
+
+  @issue-6929
+  Scenario Outline: create a password-protected public link on a file with the name same to the previously deleted one
+    Given using OCS API version "<ocs-api-version>"
+    And user "Alice" has uploaded file with content "test data 1" to "/test.txt"
+    And user "Alice" has created a public link share with settings
+      | path        | test.txt |
+      | permissions | read     |
+    And user "Alice" has deleted file "test.txt"
+    When user "Alice" updates the last public link share using the sharing API with
+      | password | testpassword |
+    Then the OCS status code should be "998"
+    And the HTTP status code should be "<http-code>"
+    And the OCS status message should be "update public share: resource not found"
+    Examples:
+      | ocs-api-version | http-code |
+      | 1               | 200       |
+      | 2               | 404       |