diff --git a/.drone.yml b/.drone.yml
index 7f9e5589..b472cf6b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -485,7 +485,6 @@ matrix:
       NEED_INSTALL_APP: true
       FIX_PERMISSIONS: true
       USE_EMAIL: true
-      NEED_USER_MANAGEMENT_APP: true
 
     - PHP_VERSION: 7.1
       OC_VERSION: daily-stable10-qa
@@ -498,7 +497,6 @@ matrix:
       NEED_INSTALL_APP: true
       FIX_PERMISSIONS: true
       USE_EMAIL: true
-      NEED_USER_MANAGEMENT_APP: true
 
     - PHP_VERSION: 7.2
       OC_VERSION: daily-stable10-qa
@@ -511,7 +509,6 @@ matrix:
       NEED_INSTALL_APP: true
       FIX_PERMISSIONS: true
       USE_EMAIL: true
-      NEED_USER_MANAGEMENT_APP: true
 
     - PHP_VERSION: 7.2
       OC_VERSION: daily-stable10-qa
@@ -524,7 +521,6 @@ matrix:
       NEED_INSTALL_APP: true
       FIX_PERMISSIONS: true
       USE_EMAIL: true
-      NEED_USER_MANAGEMENT_APP: true
 
     - PHP_VERSION: 7.2
       OC_VERSION: daily-stable10-qa
diff --git a/tests/acceptance/features/bootstrap/WebUIGuestsContext.php b/tests/acceptance/features/bootstrap/WebUIGuestsContext.php
index e895eeeb..627e9e61 100644
--- a/tests/acceptance/features/bootstrap/WebUIGuestsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIGuestsContext.php
@@ -86,34 +86,6 @@ public function __construct(SetPasswordPage $setPasswordPage, FilesPage $filesPa
 		$this->filesPage = $filesPage;
 	}
 
-	/**
-	 * @return string|null
-	 */
-	public function getGuestGroupName() {
-		$configkeyList = $this->featureContext->getConfigKeyList('guests');
-		foreach ($configkeyList as $config) {
-			if ($config['configkey'] === 'group') {
-				return $config['value'];
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @Given guest user :user has been created with email :email and password :password
-	 *
-	 * @param string $user
-	 * @param string $email
-	 * @param string $password
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function guestUserHasBeenCreatedWithEmailAndPassword($user, $email, $password) {
-		$this->featureContext->createUser($user, $password, $user, $email);
-		$this->featureContext->addUserToGroup($user, $this->getGuestGroupName());
-	}
-
 	/**
 	 * @When guest user :user registers and sets password to :password using the webUI
 	 *
diff --git a/tests/acceptance/features/webUIGuests/guests.feature b/tests/acceptance/features/webUIGuests/guests.feature
index ad58b7fc..09ad044e 100644
--- a/tests/acceptance/features/webUIGuests/guests.feature
+++ b/tests/acceptance/features/webUIGuests/guests.feature
@@ -78,17 +78,17 @@ Feature: Guests
     And user "valid@email.com" should exist
     # And user "valid@email.com" should not exist
 
-  @mailhog
+  @mailhog @issue-332
   Scenario: Administrator changes the guest user's password in users menu
-    Given guest user "user0" has been created with email "user0@example.com" and password "%alt2%"
+    Given user "admin" has uploaded file with content "new content" to "new-file.txt"
     And the administrator has logged in using the webUI
+    And the user shares file "new-file.txt" with guest user with email "valid@email.com" using webUI
     And the administrator has browsed to the users page
-    When the administrator changes the password of user "user0" to "newpassword" using the webUI
-    Then user "user0" should exist
-    And notifications should be displayed on the webUI with the text
-      | Password successfully changed |
+    When the administrator changes the password of user "valid@email.com" to "newpassword" using the webUI
+    #Then notifications should be displayed on the webUI with the text
+    #  | Password successfully changed |
     When the administrator logs out of the webUI
-    And the user logs in with username "user0" and password "newpassword" using the webUI
+    And the user logs in with username "valid@email.com" and password "newpassword" using the webUI
     Then the user should be redirected to a webUI page with the title "Files - %productname%"
 
   @mailhog @issue-329
@@ -105,8 +105,9 @@ Feature: Guests
 
   @mailhog
   Scenario: Administrator deletes a guest user in user's menu
-    Given guest user "user0" has been created with email "test@example.com" and password "%alt2%"
+    Given user "admin" has uploaded file with content "new content" to "new-file.txt"
     And the administrator has logged in using the webUI
+    And the user shares file "new-file.txt" with guest user with email "valid@email.com" using webUI
     And the administrator has browsed to the users page
-    When the administrator deletes user "user0" using the webUI and confirms the deletion using the webUI
-    Then user "user0" should not exist
+    When the administrator deletes user "valid@email.com" using the webUI and confirms the deletion using the webUI
+    Then user "valid@email.com" should not exist