diff --git a/gui/gui_test/control_menu/test_server_led_sub_menu.robot b/gui/gui_test/control_menu/test_server_led_sub_menu.robot
index 233a8e8..aedec87 100644
--- a/gui/gui_test/control_menu/test_server_led_sub_menu.robot
+++ b/gui/gui_test/control_menu/test_server_led_sub_menu.robot
@@ -4,10 +4,9 @@
 
 Resource        ../../lib/gui_resource.robot
 
-Suite Setup     Launch Browser And Login GUI
-Suite Teardown  Close Browser
-Test Setup      Test Setup Execution
-
+Suite Setup      Launch Browser And Login GUI
+Suite Teardown   Close Browser
+Test Setup       Test Setup Execution
 
 *** Variables ***
 
@@ -47,6 +46,8 @@
 Verify Server LED ON
     [Documentation]  Turn ON the server LED button using GUI and verify it via Redfish.
     [Tags]  Verify_Server_LED_ON
+    [Setup]  Run Keywords  Test Setup Execution  AND  Redfish.Login
+    [Teardown]  Redfish.logout
 
     # Turn Off the server LED via Redfish.
     Redfish.Patch  /redfish/v1/Systems/system  body={"IndicatorLED":"Off"}   valid_status_codes=[200, 204]
@@ -62,6 +63,8 @@
 Verify Server LED OFF
     [Documentation]  Turn OFF the server LED button using GUI and verify it via Redfish.
     [Tags]  Verify_Server_LED_OFF
+    [Setup]  Run Keywords  Test Setup Execution  AND  Redfish.Login
+    [Teardown]  Redfish.logout
 
     # Turn ON the server LED via Redfish.
     Redfish.Patch  /redfish/v1/Systems/system  body={"IndicatorLED":"Lit"}   valid_status_codes=[200, 204]
@@ -94,6 +97,9 @@
     ${gui_led_value} =  Get Text  ${xpath_led_value}
     ${redfish_led_value}=  Redfish.Get Attribute  /redfish/v1/Systems/system  IndicatorLED
 
-    ${redfish_led_value}=  Set Variable If  '${redfish_led_value}' == 'Lit'  On
+    ${redfish_led_value}=  Set Variable If
+    ...  '${redfish_led_value}' == 'Lit'  On
+    ...  '${redfish_led_value}' == 'Off'  Off
+
     Should Be Equal  ${gui_led_value}  ${expected_led_status}
     Should Be Equal  ${redfish_led_value}  ${expected_led_status}