diff --git a/extended/test_os_reboot.robot b/extended/test_os_reboot.robot
index 532c29f..d6b0c4d 100644
--- a/extended/test_os_reboot.robot
+++ b/extended/test_os_reboot.robot
@@ -2,13 +2,15 @@
 Documentation   Module to test OS reboot functionality.
 
 Resource    ../lib/boot_utils.robot
+Resource    ../extended/obmc_boot_test_resource.robot
 
-Test Teardown   FFDC On Test Case Fail
+Suite Setup     Run Key  Start SOL Console Logging
+Test Teardown   Post Test Case Execution
 
 *** Variables ***
 
 # User defined boot test iteration.
-${BOOT_LOOP_COUNT}   ${50}
+${BOOT_LOOP_COUNT}   ${1}
 
 *** Test Cases ***
 
@@ -20,7 +22,7 @@
     # 3. Issue "reboot" from OS
     # 4. Verify if OS is booted back
 
-    # By default run test for 50 loops, else user input iteration.
+    # By default run test for 1 loop, else user input iteration.
     # Fails immediately if any of the execution rounds fail.
 
     # Note: Host Reboot is implemented by the OBMC Boot Test tool.
@@ -29,3 +31,17 @@
     Repeat Keyword  ${BOOT_LOOP_COUNT} times  Host Reboot
 
 *** Keywords ***
+
+Post Test Case Execution
+    [Documentation]  Do the post test teardown.
+    # 1. Capture FFDC on test failure.
+    # 2. Stop SOL logging.
+    # 3. Close all open SSH connections.
+
+    FFDC On Test Case Fail
+
+    ${keyword_buf}=  Catenate  Stop SOL Console Logging
+    ...  \ targ_file_path=${EXECDIR}${/}logs${/}SOL.log
+    Run Key  ${keyword_buf}
+
+    Close All Connections