diff --git a/lib/obmc_boot_test.py b/lib/obmc_boot_test.py
index 36d708b..e9e7f83 100755
--- a/lib/obmc_boot_test.py
+++ b/lib/obmc_boot_test.py
@@ -74,14 +74,17 @@
     default_power_off = "Redfish Power Off"
     if redfish_rest_supported:
         delete_errlogs_cmd = "Delete Error Logs  ${quiet}=${1}"
+        delete_bmcdump_cmd = "Delete All BMC Dump"
         default_set_power_policy = "Set BMC Power Policy  ALWAYS_POWER_OFF"
     else:
         delete_errlogs_cmd = "Redfish Purge Event Log"
+        delete_bmcdump_cmd = "Redfish Delete All BMC Dumps"
         default_set_power_policy = "Redfish Set Power Restore Policy  AlwaysOff"
 else:
     default_power_on = "REST Power On"
     default_power_off = "REST Power Off"
     delete_errlogs_cmd = "Delete Error Logs  ${quiet}=${1}"
+    delete_bmcdump_cmd = "Delete All BMC Dump"
     default_set_power_policy = "Set BMC Power Policy  ALWAYS_POWER_OFF"
 boot_count = 0
 
@@ -976,6 +979,7 @@
 
         # We need to purge error logs between boots or they build up.
         grk.run_key(delete_errlogs_cmd, ignore=1)
+        grk.run_key(delete_bmcdump_cmd, ignore=1)
 
     boot_results.print_report()
     gp.qprint_timen("Finished boot " + str(boot_count) + ".")
@@ -1160,6 +1164,7 @@
 
         # Delete errlogs prior to doing any boot tests.
         grk.run_key(delete_errlogs_cmd, ignore=1)
+        grk.run_key(delete_bmcdump_cmd, ignore=1)
 
     # Process caller's boot_stack.
     while (len(boot_stack) > 0):
diff --git a/lib/utils.robot b/lib/utils.robot
index 6db5861..63464a3 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -691,12 +691,13 @@
     ...                    1=RetryAttempts
     ...                    0=Disabled
 
-    Run Keyword If  ${REDFISH_REST_SUPPORTED} == ${TRUE}
+    Run Keyword If  ${REDFISH_SUPPORTED} == ${FALSE}
+    ...    Set Auto Reboot  ${value}
+    ...  ELSE IF  ${REDFISH_REST_SUPPORTED} == ${TRUE}
     ...    Set Auto Reboot  ${value}
     ...  ELSE
     ...    Redfish Set Auto Reboot  ${rest_redfish_dict["${value}"]}
 
-
 Set Auto Reboot
     [Documentation]  Set the given auto reboot setting.
     [Arguments]  ${setting}