diff --git a/syslib/utils_os.robot b/syslib/utils_os.robot
index b7258a8..dbd1d22 100755
--- a/syslib/utils_os.robot
+++ b/syslib/utils_os.robot
@@ -2,7 +2,6 @@
 Documentation      Keywords for system test.
 
 Library            ../lib/gen_robot_keyword.py
-Library            OperatingSystem
 Resource           ../extended/obmc_boot_test_resource.robot
 Resource           ../lib/utils.robot
 Resource           ../lib/state_manager.robot
@@ -221,12 +220,13 @@
     ...  ${htx_log_dir_path}/${OS_HOST}_${cur_datetime}.nvidia_${suffix}
 
 
-Pre Test Case Execution
+Test Setup Execution
     [Documentation]  Do the initial test setup.
     # 1. Check if HTX tool exist.
     # 2. Power on
 
     Boot To OS
+    Delete All Error Logs
     Tool Exist  htxcmdline
     Tool Exist  lshw
 
diff --git a/systest/gpu_stress_test.robot b/systest/gpu_stress_test.robot
index 9a40951..40cfc50 100644
--- a/systest/gpu_stress_test.robot
+++ b/systest/gpu_stress_test.robot
@@ -4,7 +4,7 @@
 Resource         ../syslib/utils_os.robot
 
 Suite Setup      Run Keyword  Start SOL Console Logging
-Test Setup       Pre Test Case Execution
+Test Setup       Test Setup Execution
 Test Teardown    Test Teardown Execution
 Suite Teardown   Suite Teardown Execution
 
diff --git a/systest/htx_hardbootme_test.robot b/systest/htx_hardbootme_test.robot
index 8dd89a1..f0a0fba 100755
--- a/systest/htx_hardbootme_test.robot
+++ b/systest/htx_hardbootme_test.robot
@@ -36,12 +36,13 @@
 #                     "size".
 
 Resource        ../syslib/utils_os.robot
+Resource        ../lib/openbmc_ffdc_utils.robot
 Library         ../syslib/utils_keywords.py
 Library         ../lib/utils_files.py
 
 Suite Setup     Run Keyword  Start SOL Console Logging
-Test Setup      Pre Test Case Execution
-Test Teardown   Post Test Case Execution
+Test Setup      Test Setup Execution
+Test Teardown   Test Teardown Execution
 
 
 *** Variables ****
@@ -136,6 +137,7 @@
     ...  Do Inventory And Compare  ${json_final_file_path}
     ...  ${PREV_INV_FILE_PATH}
 
+    Error Logs Should Not Exist
     Power Off Host
 
     # Close all SSH and REST active sessions.
@@ -206,7 +208,7 @@
     ...  AND  Sleep  ${HTX_INTERVAL}
 
 
-Post Test Case Execution
+Test Teardown Execution
     [Documentation]  Do the post test teardown.
     # 1. Shut down HTX exerciser if test Failed.
     # 2. Capture FFDC on test failure.
diff --git a/systest/network_stability_test.robot b/systest/network_stability_test.robot
index 25cbabb..3e233f4 100644
--- a/systest/network_stability_test.robot
+++ b/systest/network_stability_test.robot
@@ -5,8 +5,8 @@
 Resource         ../syslib/utils_os.robot
 Library          ../syslib/utils_keywords.py
 
-Test Setup      Pre Test Case Execution
-Test Teardown   Post Test Case Execution
+Test Setup      Test Setup Execution
+Test Teardown   Test Teardown Execution
 
 *** Variables ****
 
@@ -74,7 +74,7 @@
     REST Upload File To BMC
 
 
-Post Test Case Execution
+Test Teardown Execution
     [Documentation]  Do the post test teardown.
     # 1. Shut down HTX exerciser if test Failed.
     # 2. Capture FFDC on test failure.