diff --git a/tests/test_power_restore.robot b/tests/test_power_restore.robot
index 42ad923..fe8358a 100644
--- a/tests/test_power_restore.robot
+++ b/tests/test_power_restore.robot
@@ -12,8 +12,8 @@
 
 Library         SSHLibrary
 
-Test Teardown   FFDC On Test Case Fail
-Suite Teardown  Set BMC Power Policy  RESTORE_LAST_STATE
+Test Teardown   Post Test Case Execution
+Suite Teardown  Post Test Suite Execution
 
 Force Tags      power_restore
 
@@ -168,3 +168,20 @@
     # expectedState   Expected host state.
     ${currentState}=  Get Host State
     Should Be Equal  ${currentState}  ${expectedState}
+
+
+Post Test Case Execution
+    [Documentation]  Do the post test teardown.
+    # 1. Capture FFDC on test failure.
+    # 2. Close all open SSH connections.
+
+    FFDC On Test Case Fail
+    Close All Connections
+
+
+Post Test Suite Execution
+    [Documentation]  Do the post suite teardown.
+    # 1. Set policy to default.
+
+    Run Keyword And Ignore Error  Set BMC Power Policy  RESTORE_LAST_STATE
+