diff --git a/systest/htx_hardbootme_test.robot b/systest/htx_hardbootme_test.robot
index db9d25c..428bf11 100644
--- a/systest/htx_hardbootme_test.robot
+++ b/systest/htx_hardbootme_test.robot
@@ -3,6 +3,7 @@
 
 Resource         ../syslib/utils_os.robot
 
+Suite Setup     Run Key  Start SOL Console Logging
 Test Setup      Pre Test Case Execution
 Test Teardown   Post Test Case Execution
 
@@ -50,6 +51,10 @@
 
     Power Off Host
 
+    # Close all SSH and REST active sessions.
+    Close All Connections
+    Flush REST Sessions
+
     Rprint Timen  HTX Test ran for: ${HTX_DURATION}
 
 
@@ -71,5 +76,9 @@
     Run Keyword If  '${TEST_STATUS}' == 'FAIL' and ${HTX_KEEP_RUNNING} == ${0}
     ...  Shutdown HTX Exerciser
 
+    ${keyword_buf}=  Catenate  Stop SOL Console Logging
+    ...  \ targ_file_path=${EXECDIR}${/}logs${/}SOL.log
+    Run Key  ${keyword_buf}
+
     FFDC On Test Case Fail
     Close All Connections