diff --git a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
index 21ab456..be17857 100644
--- a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
+++ b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
@@ -3,9 +3,8 @@
 Documentation   Test OpenBMC GUI "Sensors" sub-menu.
 Resource        ../../lib/gui_resource.robot
 
-Suite Setup     Launch Browser And Login GUI
+Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
-Test Setup      Test Setup Execution
 
 
 *** Variables ***
@@ -117,9 +116,10 @@
 
 *** Keywords ***
 
-Test Setup Execution
-    [Documentation]  Do test case setup tasks.
+Suite Setup Execution
+    [Documentation]  Do suite setup tasks.
 
+    Launch Browser And Login GUI
     Click Element  ${xpath_hardware_status_menu}
     Click Element  ${xpath_sensor_sub_menu}
     Wait Until Keyword Succeeds  30 sec  5 sec  Location Should Contain  sensors
diff --git a/gui/gui_test/resource_management_menu/test_power_sub_menu.robot b/gui/gui_test/resource_management_menu/test_power_sub_menu.robot
index c0bc5d8..4de7f08 100644
--- a/gui/gui_test/resource_management_menu/test_power_sub_menu.robot
+++ b/gui/gui_test/resource_management_menu/test_power_sub_menu.robot
@@ -4,9 +4,8 @@
 
 Resource        ../../lib/gui_resource.robot
 
-Suite Setup     Launch Browser And Login GUI
+Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
-Test Setup      Test Setup Execution
 
 
 *** Variables ***
@@ -138,9 +137,10 @@
     [return]  ${redfish_power['PowerControl'][0]['PowerLimit']['LimitInWatts']}
 
 
-Test Setup Execution
-    [Documentation]  Do test case setup tasks.
+Suite Setup Execution
+    [Documentation]  Do suite setup tasks.
 
+    Launch Browser And Login GUI
     Click Element  ${xpath_resource_management_menu}
     Click Element  ${xpath_power_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  power