diff --git a/ipmi/test_ipmi_user.robot b/ipmi/test_ipmi_user.robot
index 3ec74ff..2e70eb3 100644
--- a/ipmi/test_ipmi_user.robot
+++ b/ipmi/test_ipmi_user.robot
@@ -6,7 +6,7 @@
 Library             ../lib/ipmi_utils.py
 
 Test Teardown       Test Teardown Execution
-
+Suite Teardown      Delete All Non Root IPMI User
 
 *** Variables ***
 
@@ -434,4 +434,3 @@
     [Documentation]  Do the test teardown execution.
 
     FFDC On Test Case Fail
-    Delete All Non Root IPMI User