diff --git a/tests/test_bmc_devicetree.robot b/redfish/extended/test_bmc_devicetree.robot
similarity index 79%
rename from tests/test_bmc_devicetree.robot
rename to redfish/extended/test_bmc_devicetree.robot
index 90a535c..3a40158 100644
--- a/tests/test_bmc_devicetree.robot
+++ b/redfish/extended/test_bmc_devicetree.robot
@@ -1,12 +1,14 @@
 *** Settings ***
 Documentation       This suite is for Verifying BMC device tree.
 
-Resource            ../lib/openbmc_ffdc.robot
-Resource            ../lib/ipmi_client.robot
+Resource            ../../lib/utils.robot
+Resource            ../../lib/openbmc_ffdc.robot
+Resource            ../../lib/ipmi_client.robot
 Library             String
 
-Test Setup          Open Connection And Log In
-Test Teardown       Post Test Case Execution
+Suite Setup         Open Connection And Log In
+Suite Teardown      Close All Connections
+Test Teardown       FFDC On Test Case Fail
 
 *** Variables ***
 ${devicetree_base}  /sys/firmware/devicetree/base/
@@ -21,15 +23,6 @@
    model
 
 
-Check BMC Name Property Is Set
-   [Documentation]  Verify if the BMC name property is populated.
-   [Tags]  Check_BMC_Name_Property_Is_Set
-   [Template]  Template Check Property
-
-   #Property
-   name
-
-
 Check BMC Compatible Property Is Set
    [Documentation]  Verify if the BMC compatible property is populated.
    [Tags]  Check_BMC_Compatible_Property_Is_Set
@@ -82,7 +75,7 @@
    [Template]  Template Check Property
 
    #Property
-   fsi-master/name
+   gpio-fsi/name
 
 
 Check BMC FSI Compatible Property Is Set
@@ -91,7 +84,7 @@
    [Template]  Template Check Property
 
    #Property
-   fsi-master/compatible
+   gpio-fsi/compatible
 
 
 Check BMC GPIO-FSI Name Property Is Set
@@ -170,24 +163,6 @@
    leds/compatible
 
 
-Check BMC Clocks Name Property Is Set
-   [Documentation]  Verify if the BMC clocks name property is populated.
-   [Tags]  Check_BMC_Clocks_Name_Property_Is_Set
-   [Template]  Template Check Property
-
-   #Property
-   clocks/name
-
-
-Check BMC Clocks Compatible Property Is Set
-   [Documentation]  Verify if the BMC clocks compatible property is populated.
-   [Tags]  Check_BMC_Clocks_Compatible_Property_Is_Set
-   [Template]  Template Check Property
-
-   #Property
-   clocks/clk_clkin/compatible
-
-
 *** Keywords ***
 
 Template Check Property
@@ -203,10 +178,3 @@
     ${length}=  Get Length  ${output}
     Should Be True  ${length} > 1
 
-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