diff --git a/tests/libraries/environment.py b/tests/libraries/environment.py
index 8b7a504e8e138b8ade707caf07a786d2f96aa1b6..0cb833e8d4c6c16d836579bc5843a2adb6c5f22f 100644
--- a/tests/libraries/environment.py
+++ b/tests/libraries/environment.py
@@ -29,5 +29,6 @@ class CapifUserManager():
         for uuid, stored_user in self.register_users.items():
             if stored_user == username:
                 return uuid
+        return None
 
 CAPIF_USERS = CapifUserManager()
\ No newline at end of file
diff --git a/tests/resources/common/basicRequests.robot b/tests/resources/common/basicRequests.robot
index 40ee878789064531615c4bdff70da7cdab2fc49d..dcac0139c729c8532b7039ca5ddb9312688d6523 100644
--- a/tests/resources/common/basicRequests.robot
+++ b/tests/resources/common/basicRequests.robot
@@ -6,6 +6,7 @@ Library             Collections
 Library             OperatingSystem
 Library             XML
 Library             Telnet
+Library    String
 
 
 *** Variables ***
@@ -441,6 +442,10 @@ Delete User At Register
         ${user_uuid}=    Call Method    ${CAPIF_USERS}    get_user_uuid    ${username}
     END
 
+    IF   "${user_uuid}" == "${NONE}"
+        ${user_uuid}=   Get User Uuid At Register    ${username}
+    END
+
     ${resp}=    Delete User Admin Register Request   ${user_uuid}
 
     Should Be Equal As Strings    ${resp.status_code}    204
diff --git a/tests/tasks/Users Management/users.robot b/tests/tasks/Users Management/users.robot
index d4f0baaa8a5468b84d18e133db0f8667425b33d6..5adb3ec98f08cf8c142d3217868c7bd1bb172373 100644
--- a/tests/tasks/Users Management/users.robot	
+++ b/tests/tasks/Users Management/users.robot	
@@ -21,8 +21,8 @@ ${BACKUP_DIRECTORY}                 backup
 ${RESULT_FOLDER}                    /opt/robot-tests/results
 ${OUTPUT_ZIP_FILE}                  entities_loaded.zip
 
-${USER_PASSWORD}                    umapassword
-${USERNAME_PREFIX}                  uma
+${USER_PASSWORD}                    password
+${USERNAME_PREFIX}                  user
 ${DESCRIPTION}                      Testing purpouse
 
 
@@ -82,16 +82,10 @@ Remove Client Users
 
     FOR    ${username}    IN    @{entities_dictionary}
         Log    ${username}=${entities_dictionary}[${username}]
-        Run Keyword And Continue On Failure    ${username}
+        Run Keyword And Continue On Failure   Delete User At Register  username=${username}
     END
 
     ${result}=    Run Process    ls    -l
 
     Log Many    ${result.stdout}
 
-
-*** Keywords ***
-Delete User
-    [Arguments]    ${username}
-    ${user_uuid}=    Get User Uuid At Register    ${username}
-    Delete User Admin Register Request    ${user_uuid}