diff --git a/test/gui/shared/scripts/helpers/api/Provisioning.py b/test/gui/shared/scripts/helpers/api/Provisioning.py
index fe9ad350d5b..7f3fd74e9d4 100644
--- a/test/gui/shared/scripts/helpers/api/Provisioning.py
+++ b/test/gui/shared/scripts/helpers/api/Provisioning.py
@@ -87,7 +87,7 @@ def create_user(username):
 def delete_created_users():
     for username, user_info in list(UserHelper.createdUsers.items()):
         if get_config('ocis'):
-            ocis.delete_user(user_info["id"])
+            ocis.delete_user(user_info["id"], username)
         else:
-            oc.delete_user(user_info["username"])
+            oc.delete_user(user_info["id"])
         del UserHelper.createdUsers[username]
diff --git a/test/gui/shared/scripts/helpers/api/oc10.py b/test/gui/shared/scripts/helpers/api/oc10.py
index e61b6bddcc9..0d78cc95cbd 100644
--- a/test/gui/shared/scripts/helpers/api/oc10.py
+++ b/test/gui/shared/scripts/helpers/api/oc10.py
@@ -50,13 +50,22 @@ def create_user(username, password, displayname, email):
         "email": email,
     }
     response = request.post(url, body)
-    request.assertHttpStatus(response, 200)
+    if response.status_code != 200:
+        raise Exception(
+            "Creating user '%s' failed with %s:\n" % (username, response.status_code)
+            + response.text
+        )
     # oc10 does not set display name while creating user,
     # so we need update the user info
     user_url = url_join(get_ocs_url(), "users", username)
     display_name_body = {"key": "displayname", "value": displayname}
     display_name_response = request.put(user_url, display_name_body)
-    request.assertHttpStatus(display_name_response, 200)
+    if display_name_response.status_code != 200:
+        raise Exception(
+            "Updating the user '%s' with displayname '%s' failed with %s:\n"
+            % (username, displayname, display_name_response.status_code)
+            + response.text
+        )
     return {
         "id": username,
         "username": username,
@@ -69,4 +78,8 @@ def create_user(username, password, displayname, email):
 def delete_user(userid):
     url = url_join(get_ocs_url(), 'users', userid)
     response = request.delete(url)
-    request.assertHttpStatus(response, 200)
+    if response.status_code != 200:
+        raise Exception(
+            "Deleting user '%s' failed with %s:\n" % (userid, response.status_code)
+            + response.text
+        )
diff --git a/test/gui/shared/scripts/helpers/api/ocis.py b/test/gui/shared/scripts/helpers/api/ocis.py
index ee9918d4ea0..1654739636b 100644
--- a/test/gui/shared/scripts/helpers/api/ocis.py
+++ b/test/gui/shared/scripts/helpers/api/ocis.py
@@ -64,7 +64,11 @@ def create_user(username, password, displayname, email):
         }
     )
     response = request.post(url, body)
-    request.assertHttpStatus(response, 201)
+    if response.status_code != 201:
+        raise Exception(
+            "Creating user '%s' failed with %s:\n" % (username, response.status_code)
+            + response.text
+        )
     resp_object = response.json()
     return {
         "id": resp_object['id'],
@@ -75,7 +79,11 @@ def create_user(username, password, displayname, email):
     }
 
 
-def delete_user(id):
+def delete_user(id, username):
     url = url_join(get_graph_url(), 'users', id)
     response = request.delete(url)
-    request.assertHttpStatus(response, 204)
+    if response.status_code != 204:
+        raise Exception(
+            "Deleting user '%s' failed with %s:\n" % (username, response.status_code)
+            + response.text
+        )