diff --git a/testsuite/ui/views/master/audience/tenant.py b/testsuite/ui/views/master/audience/tenant.py
index 9ab758b7..0b4142c5 100644
--- a/testsuite/ui/views/master/audience/tenant.py
+++ b/testsuite/ui/views/master/audience/tenant.py
@@ -66,7 +66,7 @@ class TenantDetailView(BaseMasterAudienceView):
 
     path_pattern = "/buyers/accounts/{account_id}"
     edit_button = ThreescaleEditButton()
-    applications_button = Text("//*[contains(@title,'applications')]")
+    applications_button = Text("//*[@data-ouia-component-id='OUIA-Generated-NavExpandable-3']/button")
     public_domain = Text(".//th[contains(text(),'Public domain')]/parent::*/td/a")
     admin_domain = Text(".//th[contains(text(),'Admin domain')]/parent::*/td/a")
     resume_b = Button("Resume", classes=["button-to", "resume"])
diff --git a/testsuite/ui/views/master/foundation.py b/testsuite/ui/views/master/foundation.py
index 5bbb4412..0d45ddb7 100644
--- a/testsuite/ui/views/master/foundation.py
+++ b/testsuite/ui/views/master/foundation.py
@@ -21,8 +21,8 @@ class BaseMasterView(View, Navigable):
     support_link = Text("//a[@href='//access.redhat.com/products/red-hat-3scale#support']")
     master_header = Text("//*[contains(@class,'Header--master')]")
     context_menu = Dropdown(component_id="context-selector")
-    documentation = Dropdown(component_id="OUIA-Generated-Dropdown-2")
-    user_session = Dropdown(component_id="OUIA-Generated-Dropdown-3")
+    documentation = Dropdown(component_id="OUIA-Generated-DropdownToggle-2")
+    user_session = Dropdown(component_id="OUIA-Generated-DropdownToggle-3")
     threescale_version = Text("//*[contains(@class,'powered-by-3scale')]/span")
 
     def __init__(self, parent, logger=None, **kwargs):