diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index 7e391c3..7aa9c69 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -6,10 +6,10 @@
 Resource         ../../lib/openbmc_ffdc.robot
 Resource         ../../lib/bmc_redfish_utils.robot
 
-Suite Setup      Delete All Redfish Sessions
+Suite Setup      Run Keyword And Ignore Error  Delete All Redfish Sessions
 Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
-Suite Teardown   Delete All Redfish Sessions
+Suite Teardown   Run Keyword And Ignore Error  Delete All Redfish Sessions
 
 *** Variables ***