diff --git a/gui/obmc_gui/test/gui_header/test_obmc_gui_power_operations.robot b/gui/obmc_gui/test/gui_header/test_obmc_gui_power_operations.robot
index 2d72037..ca9d286 100644
--- a/gui/obmc_gui/test/gui_header/test_obmc_gui_power_operations.robot
+++ b/gui/obmc_gui/test/gui_header/test_obmc_gui_power_operations.robot
@@ -6,8 +6,7 @@
 Resource  ../../lib/resource.robot
 
 Test Setup      Test Setup Execution
-Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Close Browser
+Test Teardown   Close Browser
 
 *** Test Cases ***
 
@@ -134,7 +133,8 @@
 Test Setup Execution
    [Documentation]  Do testcase setup tasks.
 
-   # Refresh the GUI and navigate to server power page.
-   Click Element  ${xpath_select_refresh_button}
+   # Launch the GUI and navigate to server power page.
+   Launch Browser And Login OpenBMC GUI
    Click Element  ${xpath_select_server_power}
    Wait Until Page Contains  Server power operations
+
diff --git a/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot b/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
index 937e875..fd79065 100644
--- a/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
+++ b/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
@@ -12,8 +12,6 @@
 Resource        ../../../../lib/logging_utils.robot
 Library         ../../../../lib/gen_robot_keyword.py
 
-Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
@@ -318,8 +316,8 @@
    Run Keyword If  ${status} == ${False}  Install Tarball
    Delete Error Logs And Verify
 
-   # Refresh the GUI and navigate to server health page.
-   Click Element  ${xpath_select_refresh_button}
+   # Launch the GUI and navigate to server health page.
+   Launch Browser And Login OpenBMC GUI
    Click Element  ${xpath_select_server_health}
    Wait Until Page Contains  Event log
 
@@ -329,3 +327,4 @@
    FFDC On Test Case Fail
    Delete All Error Logs
    Close All Connections
+   Close Browser