diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml
index d1489a00864a02602a745818d9c47d6f4a24f733..3108ea41407ee1a0a8f0eae4fd0d2b80c00e017f 100644
--- a/tests/acceptance/config/behat.yml
+++ b/tests/acceptance/config/behat.yml
@@ -63,6 +63,9 @@ default:
         Jane:
           selenium2:
             wd_host: %selenium.server%
+        Jim:
+          selenium2:
+            wd_host: %selenium.server%
         Rubeus:
           # Rubeus uses a browser that has CSS grid support.
           selenium2:
diff --git a/tests/acceptance/features/app-files.feature b/tests/acceptance/features/app-files.feature
index b894d2bb83967667cf89cd731fb7873cc1c5f27d..e037bc1a36ed2f1d6821bc908f22ece122a0579e 100644
--- a/tests/acceptance/features/app-files.feature
+++ b/tests/acceptance/features/app-files.feature
@@ -351,6 +351,33 @@ Feature: app-files
     And I see that the "Sharing" tab in the details view is eventually loaded
     And I see that the file is shared with me by "admin"
 
+  Scenario: reshare a file with another user
+    Given I act as John
+    And I am logged in as the admin
+    And I act as Jane
+    And I am logged in
+    And I act as Jim
+    And I am logged in as "user1"
+    And I act as John
+    And I rename "welcome.txt" to "farewell.txt"
+    And I see that the file list contains a file named "farewell.txt"
+    And I share "farewell.txt" with "user0"
+    And I see that the file is shared with "user0"
+    And I act as Jane
+    # The Files app is open again to reload the file list
+    And I open the Files app
+    When I share "farewell.txt" with "user1"
+    And I see that the file is shared with "user1"
+    And I act as Jim
+    # The Files app is open again to reload the file list
+    And I open the Files app
+    Then I see that the file list contains a file named "farewell.txt"
+    And I open the details view for "farewell.txt"
+    And I see that the details view is open
+    And I open the "Sharing" tab in the details view
+    And I see that the "Sharing" tab in the details view is eventually loaded
+    And I see that the file is shared with me by "user0"
+
   Scenario: share an empty folder with another user
     Given I act as John
     And I am logged in as the admin
diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php
index df7944aa912f91c394bc75e2d0e2a73ff7850d0e..048d23d92953d30700ae837281196b326a1e4434 100644
--- a/tests/acceptance/features/bootstrap/LoginPageContext.php
+++ b/tests/acceptance/features/bootstrap/LoginPageContext.php
@@ -131,6 +131,15 @@ class LoginPageContext implements Context, ActorAwareInterface {
 		$this->filesAppContext->iSeeThatTheCurrentPageIsTheFilesApp();
 	}
 
+	/**
+	 * @Given I am logged in as :userName
+	 */
+	public function iAmLoggedInAs($userName) {
+		$this->featureContext->iVisitTheHomePage();
+		$this->iLogInWithUserAndPassword($userName, "123456acb");
+		$this->filesAppContext->iSeeThatTheCurrentPageIsTheFilesApp();
+	}
+
 	/**
 	 * @Given I am logged in as the admin
 	 */
diff --git a/tests/acceptance/installAndConfigureServer.sh b/tests/acceptance/installAndConfigureServer.sh
index 98de72bf45ef28a39c9b8bc582346e38ef05b7fb..d24405fa448f7a6b02fa4d90cc36e0e0352c16ec 100755
--- a/tests/acceptance/installAndConfigureServer.sh
+++ b/tests/acceptance/installAndConfigureServer.sh
@@ -35,6 +35,7 @@ fi
 php occ maintenance:install --admin-pass=admin
 
 OC_PASS=123456acb php occ user:add --password-from-env user0
+OC_PASS=123456acb php occ user:add --password-from-env user1
 OC_PASS=123456acb php occ user:add --password-from-env disabledUser
 php occ user:disable disabledUser