diff --git a/redfish/extended/test_basic_ci.robot b/redfish/extended/test_basic_ci.robot
index 5064324..10a7c2e 100644
--- a/redfish/extended/test_basic_ci.robot
+++ b/redfish/extended/test_basic_ci.robot
@@ -9,7 +9,7 @@
 Resource            ../../lib/openbmc_ffdc.robot
 Resource            ../../lib/bmc_redfish_resource.robot
 
-Test Setup          Printn
+Test Setup          Test Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
 *** Variables ***
@@ -81,6 +81,13 @@
 
 *** Keywords ***
 
+Test Setup Execution
+   [Documentation]  Do test case setup tasks.
+
+   Printn
+   Redfish.Login
+
+
 Check BMC Uptime Journald
     [Documentation]  Check BMC journald uptime entry.
 
diff --git a/redfish/systems/test_power_operations.robot b/redfish/systems/test_power_operations.robot
index 30a35b5..d61f547 100644
--- a/redfish/systems/test_power_operations.robot
+++ b/redfish/systems/test_power_operations.robot
@@ -62,6 +62,7 @@
 
     Printn
     Start SOL Console Logging
+    Redfish.Login
 
 
 Test Teardown Execution
@@ -71,7 +72,9 @@
     ${sol_log}=    Stop SOL Console Logging
     Log   ${sol_log}
 
+    Redfish.Login
     Run Keyword If  ${REDFISH_SUPPORTED}
     ...    Redfish Set Auto Reboot  RetryAttempts
     ...  ELSE
     ...    Set Auto Reboot  ${1}
+    Redfish.Logout