diff --git a/openpower/test_bmc_devicetree.robot b/openpower/test_bmc_devicetree.robot
index 7087253..ee9dacf 100644
--- a/openpower/test_bmc_devicetree.robot
+++ b/openpower/test_bmc_devicetree.robot
@@ -6,9 +6,8 @@
 Resource            ../lib/ipmi_client.robot
 Library             String
 
-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       Run Keywords  Close All Connections  AND FFDC On Test Case Fail
 
 *** Variables ***
 ${devicetree_base}  /sys/firmware/devicetree/base/