diff --git a/lib/fan_utils.robot b/lib/fan_utils.robot
index c3b8583..3fbf99a 100755
--- a/lib/fan_utils.robot
+++ b/lib/fan_utils.robot
@@ -396,25 +396,6 @@
 
     Set Fan State  ${test_fan_name}  ${fan_nonfunctional}
 
-    # Wait for error to be asserted.
-
-    :FOR  ${n}  IN RANGE  30
-    \  ${front_fault}=  Get System LED State  front_fault
-    \  ${rear_fault}=  Get System LED State  rear_fault
-    \  Run Key U  Sleep \ 1s
-    \  Exit For Loop If  '${front_fault}' == 'On' and '${rear_fault}' == 'On'
-
-    Verify System Error Indication Due To Fans
-
-    # Verify the error log is for test_fan_name.
-    ${elog_entries}=  Get Logging Entry List
-    :FOR  ${elog_entry}  IN  @{elog_entries}
-    \  ${elog_entry_callout}=  Set Variable  ${elog_entry}/callout
-    \  ${endpoint}=  Read Attribute  ${elog_entry_callout}  endpoints
-    \  ${endpoint_name}=  Get From List  ${endpoint}  0
-    \  Should Contain  ${endpoint_name}  ${test_fan_name}
-    ...  msg=Error log present but not for ${test_fan_name}.
-
     Run Key U  Sleep \ ${system_response_time}
 
     # A heavily loaded system may have powered-off.
@@ -451,19 +432,3 @@
     # The Wait For PowerOff keyword will time-out and report
     # an error if power off does not happen within a reasonable time.
     Wait For PowerOff
-
-    Run Key U  Sleep \ ${wait_after_poweroff}
-
-    Verify System Error Indication Due To Fans
-
-    # Verify there is an error log because of the shutdown.
-    ${expect}=  Catenate
-    ...  xyz.openbmc_project.State.Shutdown.Inventory.Error.Fan
-    ${elog_entries}=  Get Logging Entry List
-    :FOR  ${elog_entry}  IN  @{elog_entries}
-    \  ${elog_message}=  Read Attribute  ${elog_entry}  Message
-    \  ${found}=  Set Variable  1
-    \  Run Keyword If  '${elog_message}' == '${expect}'  Exit For Loop
-    \  ${found}=  Set Variable  0
-    Run Keyword If  not ${found}  Fail
-    ...  msg=No error log for event Shutdown.Inventory.Error.Fan.
diff --git a/redfish/extended/test_fan_operation.robot b/redfish/extended/test_fan_operation.robot
index e45ed0b..7c46593 100755
--- a/redfish/extended/test_fan_operation.robot
+++ b/redfish/extended/test_fan_operation.robot
@@ -45,10 +45,10 @@
     [Tags]  Check_Fans_Running_At_Target_Speed
 
     # Set the speed tolerance criteria.
-    # A tolerance value of .15 means that the fan's speed should be
-    # within 15% of its set target speed.   Fans may be accelerating
-    # or decelerating to meet a new target, so allow .10 extra.
-    ${tolerance}=  Set Variable  .25
+    # A tolerance value of .30 means that the fan's speed should be
+    # within 30% of its set target speed.   Fans may be accelerating
+    # or decelerating to meet a new target, so allow .20 extra.
+    ${tolerance}=  Set Variable  .50
     Rprint Vars  tolerance
 
     Verify Fan Speed  ${tolerance}  ${fan_names}
@@ -87,6 +87,9 @@
     [Documentation]  Shut down when not enough fans.
     [Tags]  Check_System_Shutdown_Due_To_Fans
 
+    # Previous test may have shut down the OS.
+    Redfish Power On  stack_mode=skip
+
     Verify System Shutdown Due To Fans  ${fan_names}
 
 
diff --git a/tests/test_fans_os.robot b/tests/test_fans_os.robot
index fe5246b..efd081c 100755
--- a/tests/test_fans_os.robot
+++ b/tests/test_fans_os.robot
@@ -47,10 +47,10 @@
     [Tags]  Check_Fans_Running_At_Target_Speed
 
     # Set the speed tolerance criteria.
-    # A tolerance value of .15 means that the fan's speed should be
-    # within 15% of its set target speed.   Fans may be accelerating
-    # or decelerating to meet a new target, so allow .10 extra.
-    ${tolerance}=  Set Variable  .25
+    # A tolerance value of .30 means that the fan's speed should be
+    # within 30% of its set target speed.   Fans may be accelerating
+    # or decelerating to meet a new target, so allow .20 extra.
+    ${tolerance}=  Set Variable  .50
     Rpvars  tolerance
 
     Verify Fan Speed  ${tolerance}  ${fan_names}
@@ -89,6 +89,9 @@
     [Documentation]  Shut down when not enough fans.
     [Tags]  Check_System_Shutdown_Due_To_Fans
 
+    # Previous test may have shut down the OS.
+    REST Power On  stack_mode=skip
+
     Verify System Shutdown Due To Fans  ${fan_names}