diff --git a/gui/obmc_gui/test/gui_header/test_obmc_gui_ip_refresh_check.robot b/gui/obmc_gui/test/gui_header/test_obmc_gui_ip_refresh_check.robot
index e3ee534..76d1bf6 100644
--- a/gui/obmc_gui/test/gui_header/test_obmc_gui_ip_refresh_check.robot
+++ b/gui/obmc_gui/test/gui_header/test_obmc_gui_ip_refresh_check.robot
@@ -7,7 +7,8 @@
 Resource        ../../lib/resource.robot
 
 Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Logout And Close Browser
+Suite Teardown  Close Browser
+
 
 *** Variables ***
 ${xpath_select_server_control}  //*[@id="header__wrapper"]/div/div[2]/p[2]
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 a026611..937e875 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
@@ -13,7 +13,7 @@
 Library         ../../../../lib/gen_robot_keyword.py
 
 Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Logout And Close Browser
+Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
diff --git a/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot b/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot
index edbf7e8..5a2de45 100644
--- a/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot
+++ b/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot
@@ -6,7 +6,7 @@
 Resource        ../../../../lib/logging_utils.robot
 
 Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Logout And Close Browser
+Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 Test Teardown   Run Keyword If Test Failed  Re-Launch GUI on Failure
 
diff --git a/gui/obmc_gui/test/server_config/test_obmc_gui_network_settings.robot b/gui/obmc_gui/test/server_config/test_obmc_gui_network_settings.robot
index 39f538d..8f705e9 100644
--- a/gui/obmc_gui/test/server_config/test_obmc_gui_network_settings.robot
+++ b/gui/obmc_gui/test/server_config/test_obmc_gui_network_settings.robot
@@ -6,7 +6,7 @@
 Resource        ../../lib/resource.robot
 
 Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Logout And Close Browser
+Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
 *** Variables ***
diff --git a/gui/obmc_gui/test/server_health/test_obmc_gui_hardware_status.robot b/gui/obmc_gui/test/server_health/test_obmc_gui_hardware_status.robot
index 115fab4..f50693d 100644
--- a/gui/obmc_gui/test/server_health/test_obmc_gui_hardware_status.robot
+++ b/gui/obmc_gui/test/server_health/test_obmc_gui_hardware_status.robot
@@ -5,7 +5,7 @@
 Resource        ../../lib/resource.robot
 
 Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Logout And Close Browser
+Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
 *** Variables ***
diff --git a/gui/obmc_gui/test/server_health/test_obmc_gui_sensors.robot b/gui/obmc_gui/test/server_health/test_obmc_gui_sensors.robot
index 8957998..7ced517 100644
--- a/gui/obmc_gui/test/server_health/test_obmc_gui_sensors.robot
+++ b/gui/obmc_gui/test/server_health/test_obmc_gui_sensors.robot
@@ -5,7 +5,7 @@
 Resource        ../../lib/resource.robot
 
 Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Logout And Close Browser
+Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
 *** Variables ***
diff --git a/gui/obmc_gui/test/users/test_obmc_gui_manage_user.robot b/gui/obmc_gui/test/users/test_obmc_gui_manage_user.robot
index e6792e2..2447476 100644
--- a/gui/obmc_gui/test/users/test_obmc_gui_manage_user.robot
+++ b/gui/obmc_gui/test/users/test_obmc_gui_manage_user.robot
@@ -6,7 +6,7 @@
 Resource        ../../lib/resource.robot
 
 Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Logout And Close Browser
+Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
 *** Variables ***