diff --git a/openpower/ras/test_sanity.robot b/openpower/ras/test_sanity.robot
index 3c70527..e8ab3a1 100644
--- a/openpower/ras/test_sanity.robot
+++ b/openpower/ras/test_sanity.robot
@@ -10,10 +10,10 @@
 Variables       ../../lib/ras/variables.py
 Variables       ../../data/variables.py
 
-Suite Setup      Redfish Power On
+Suite Setup      Suite Setup Execution
 Test Setup       Printn
 Test Teardown    FFDC On Test Case Fail
-
+Suite Teardown   Suite Setup Teardown
 
 *** Variables ***
 ${proc_chip_id}    0
@@ -38,3 +38,17 @@
     [Documentation]  Do getmem operation.
     [Tags]  Test_BMC_Getmem
     Pdbg  -p${proc_chip_id} getmem 0x${mem_address} ${count}
+
+*** Keywords ***
+
+Suite Setup Execution
+    [Documentation]  Do the suite setup.
+
+     Redfish.Login
+     Redfish Power On
+
+
+Suite Setup Teardown
+    [Documentation]  Do the suite setup.
+
+     Redfish.Logout
diff --git a/pldm/test_pldm_platform.robot b/pldm/test_pldm_platform.robot
index d2f1662..f6c52ad 100644
--- a/pldm/test_pldm_platform.robot
+++ b/pldm/test_pldm_platform.robot
@@ -117,5 +117,7 @@
 Pldmtool Platform Suite Cleanup
     [Documentation]    Reset BMC at suite cleanup.
 
+    Redfish.Login
     Redfish Hard Power Off
     Redfish Power On
+    Redfish.Logout