diff --git a/gui/gui_test/access_control/test_obmc_gui_local_users.robot b/gui/gui_test/access_control/test_obmc_gui_local_users.robot
index 291ef27..5e4f186 100644
--- a/gui/gui_test/access_control/test_obmc_gui_local_users.robot
+++ b/gui/gui_test/access_control/test_obmc_gui_local_users.robot
@@ -14,8 +14,8 @@
 ${xpath_select_user}                     //input[contains(@class,"custom-control-input")]
 ${xpath_account_policy}                  //button[contains(text(),'Account policy settings')]
 ${xpath_add_user}                        //button[contains(text(),'Add user')]
-${xpath_edit_user}                       //button[@aria-label="Edit user"]
-${xpath_delete_user}                     //button[@aria-label="Delete user"]
+${xpath_edit_user}                       //*[@data-test-id='localUserManagement-tableRowAction-edit-0']
+${xpath_delete_user}                     //*[@data-test-id='localUserManagement-tableRowAction-delete-1']
 ${xpath_account_status_enabled_button}   //*[@data-test-id='localUserManagement-radioButton-statusEnabled']
 ${xpath_account_status_disabled_button}  //*[@data-test-id='localUserManagement-radioButton-statusDisabled']
 ${xpath_username_input_button}           //*[@data-test-id='localUserManagement-input-username']
diff --git a/gui/gui_test/gui_header/test_obmc_profile_settings.robot b/gui/gui_test/gui_header/test_obmc_profile_settings.robot
index 0780ef0..36a2324 100644
--- a/gui/gui_test/gui_header/test_obmc_profile_settings.robot
+++ b/gui/gui_test/gui_header/test_obmc_profile_settings.robot
@@ -11,8 +11,8 @@
 
 *** Variables ***
 
-${xpath_new_password}                  //input[@id="password"]
-${xpath_confirm_password}              //input[@id="password-confirmation"]
+${xpath_new_password}                  //*[@data-test-id='profileSettings-input-newPassword']
+${xpath_confirm_password}              //*[@data-test-id='profileSettings-input-confirmPassword']
 ${xpath_logged_usename}                //*[@data-test-id='appHeader-container-user']
 ${xpath_default_UTC}                   //*[@data-test-id='profileSettings-radio-defaultUTC']
 ${xpath_profile_settings_save_button}  //*[@data-test-id='profileSettings-button-saveSettings']