diff --git a/redfish/account_service/test_ipmi_redfish_user.robot b/redfish/account_service/test_ipmi_redfish_user.robot
index 4416216..956cf63 100644
--- a/redfish/account_service/test_ipmi_redfish_user.robot
+++ b/redfish/account_service/test_ipmi_redfish_user.robot
@@ -17,7 +17,7 @@
 ${valid_password2}      0penBmc2
 ${admin_level_priv}     4
 ${operator_level_priv}  3
-${max_num_users}        ${17}
+${max_num_users}        ${15}
 
 ** Test Cases **
 
@@ -196,7 +196,6 @@
 Verify Failure To Exceed Max Number Of Users
     [Documentation]  Verify failure attempting to exceed the max number of user accounts.
     [Tags]  Verify_Failure_To_Exceed_Max_Number_Of_Users
-    [Teardown]  Run Keywords  Test Teardown Execution  AND  Delete All Non Root IPMI User
 
     # Get existing user count.
     ${resp}=  Redfish.Get  /redfish/v1/AccountService/Accounts/
@@ -205,20 +204,27 @@
     ${payload}=  Create Dictionary  Password=${valid_password}
     ...  RoleId=Administrator  Enabled=${True}
 
+    @{username_list}=  Create List
+
     # Create users to reach maximum users count (i.e. 15 users).
     FOR  ${INDEX}  IN RANGE  ${current_user_count}  ${max_num_users}
       ${random_username}=  Generate Random String  8  [LETTERS]
       Set To Dictionary  ${payload}  UserName  ${random_username}
       Redfish.Post  ${REDFISH_ACCOUNTS_URI}  body=&{payload}
       ...  valid_status_codes=[${HTTP_CREATED}]
+      Append To List  ${username_list}  /redfish/v1/AccountService/Accounts/${random_username}
     END
 
-    # Verify error while creating 18th user.
+    # Verify error while creating 16th user.
     ${random_username}=  Generate Random String  8  [LETTERS]
     Set To Dictionary  ${payload}  UserName  ${random_username}
     Redfish.Post  ${REDFISH_ACCOUNTS_URI}  body=&{payload}
     ...  valid_status_codes=[${HTTP_BAD_REQUEST}]
 
+    FOR  ${saved_user_list}  IN  @{username_list}
+      Redfish.Delete  ${saved_user_list}
+    END
+
 
 Create IPMI User Without Any Privilege And Verify Via Redfish
     [Documentation]  Create user using IPMI without privilege and verify via redfish.