diff --git a/gui/data/resource_variables.py b/gui/data/resource_variables.py
index 694fd07..f47a852 100644
--- a/gui/data/resource_variables.py
+++ b/gui/data/resource_variables.py
@@ -123,7 +123,7 @@
 
     # New GUI variables
     xpath_login_button = "//button[@type='submit']"
-    xpath_logout_button = "//button[@id='app-header-logout']"
+    xpath_logout_button = "//*[@data-test-id='appHeader-link-logout']"
 
     # xpath for overview menu
     xpath_overview_menu = "//a[@href='#/']"
diff --git a/gui/gui_test/gui_header/test_gui_header.robot b/gui/gui_test/gui_header/test_gui_header.robot
index 2619973..8d736f4 100644
--- a/gui/gui_test/gui_header/test_gui_header.robot
+++ b/gui/gui_test/gui_header/test_gui_header.robot
@@ -10,7 +10,7 @@
 
 *** Variables ***
 
-${xpath_header_text}    //*[contains(@class, "navbar-text")]
+${xpath_header_text}   //*[contains(@class, "navbar-text")]
 
 
 *** Test Cases ***
@@ -27,5 +27,6 @@
     [Documentation]  Verify OpenBMC GUI logout.
     [Tags]  Verify_GUI_Logout
 
+    Click Element  ${xpath_root_button_menu}
     Click Element  ${xpath_logout_button}
     Wait Until Page Contains Element  ${xpath_login_button}  timeout=15s
diff --git a/gui/gui_test/server_health/test_obmc_gui_sensors.robot b/gui/gui_test/server_health/test_obmc_gui_sensors.robot
index 1933b57..afe55a6 100644
--- a/gui/gui_test/server_health/test_obmc_gui_sensors.robot
+++ b/gui/gui_test/server_health/test_obmc_gui_sensors.robot
@@ -10,7 +10,7 @@
 
 *** Variables ***
 ${xpath_sensors_export}         //a[contains(text(), "Export")]
-${xpath_sensors_search}         //input[@id="searchInput"]
+${xpath_sensors_search}         //input[contains(@id,"searchInput")]
 
 *** Test Cases ***
 Verify Select Sensors From Server Health