diff --git a/tests/test_escale_base.robot b/redfish/extended/test_escale_base.robot
similarity index 94%
rename from tests/test_escale_base.robot
rename to redfish/extended/test_escale_base.robot
index ed5b01c..77337db 100755
--- a/tests/test_escale_base.robot
+++ b/redfish/extended/test_escale_base.robot
@@ -6,11 +6,11 @@
 # OPENBMC_HOST        The BMC host name or IP address.
 
 
-Resource          ../lib/energy_scale_utils.robot
-Resource          ../lib/openbmc_ffdc.robot
-Resource          ../lib/utils.robot
-Resource          ../lib/logging_utils.robot
-Library           ../lib/logging_utils.py
+Resource          ../../lib/energy_scale_utils.robot
+Resource          ../../lib/openbmc_ffdc.robot
+Resource          ../../lib/utils.robot
+Resource          ../../lib/logging_utils.robot
+Library           ../../lib/logging_utils.py
 
 
 Suite Setup      Suite Setup Execution
@@ -133,6 +133,8 @@
 Suite Setup Execution
     [Documentation]  Do test setup initialization.
 
+    Redfish.Login
+
     # Save the deactivation/activation setting.
     ${cmd}=  Catenate  dcmi power get_limit | grep State
     ${resp}=  Run External IPMI Standard Command  ${cmd}
@@ -163,3 +165,5 @@
 
     # Clean up any error logs before exiting.
     Delete All Error Logs
+
+    Redfish.Logout