diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index f04d567..9806fd5 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -112,6 +112,7 @@
     # - Clean up all existing BMC dumps.
 
     Delete All Dumps
+    Run Keyword And Ignore Error  Smart Power Off
 
 Code Update Test Teardown
     [Documentation]  Do code update test case teardown.
diff --git a/extended/code_update/host_code_update.robot b/extended/code_update/host_code_update.robot
index 6feafe2..03cfae8 100644
--- a/extended/code_update/host_code_update.robot
+++ b/extended/code_update/host_code_update.robot
@@ -178,7 +178,7 @@
     # - Clean up all existing BMC dumps.
     # - Clean up all currently install PNOR images.
 
-    Initiate Host PowerOff
+    Run Keyword And Ignore Error  Smart Power Off
     Delete All Dumps
     Delete Error Logs
     Run Keyword If  'true' == '${DELETE_OLD_PNOR_IMAGES}'