diff --git a/tests/test_eventlog.robot b/tests/test_eventlog.robot
index 674fab2..be713b5 100644
--- a/tests/test_eventlog.robot
+++ b/tests/test_eventlog.robot
@@ -10,9 +10,8 @@
 
 Library           Collections
 
-Suite Setup       Open Connection And Log In
-Suite Teardown    Close All Connections
-Test Teardown     FFDC On Test Case Fail
+Test Setup        Open Connection And Log In
+Test Teardown     Post Test Case Execution
 
 Force Tags  Event_Logging
 
@@ -227,3 +226,11 @@
     ${LOGID}=    convert to integer    ${json['data']}
     ${uri}=     catenate    SEPARATOR=   ${EVENT_RECORD}   ${LOGID}
     [Return]  ${uri}
+
+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