diff --git a/ui/packages/consul-ui/app/components/consul/datacenter/selector/index.hbs b/ui/packages/consul-ui/app/components/consul/datacenter/selector/index.hbs
index 9b408ed15098..1efa07d12166 100644
--- a/ui/packages/consul-ui/app/components/consul/datacenter/selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/datacenter/selector/index.hbs
@@ -15,7 +15,7 @@
       @placeholder='Search datacenters'
       @description="WAN federated datacenters"
       class='consul-datacenter-selector'
-      data-test-datacenter-disclosure-menu
+      data-test-datacenter-menu
       as |Dropdown item|
     >
       <Dropdown.Checkmark
diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/pageobject.js b/ui/packages/consul-ui/app/components/hashicorp-consul/pageobject.js
index 71ca540a203b..e09eb5391036 100644
--- a/ui/packages/consul-ui/app/components/hashicorp-consul/pageobject.js
+++ b/ui/packages/consul-ui/app/components/hashicorp-consul/pageobject.js
@@ -46,13 +46,15 @@ export default (collection, clickable, attribute, is, authForm, emptyState) => (
   page.navigation.login = clickable('[data-test-auth-menu-signin]');
   page.navigation.dc = clickable('[data-test-datacenter-menu] button');
   page.navigation.nspace = clickable('[data-test-nspace-menu] button');
-  page.navigation.manageNspaces = clickable('[data-test-main-nav-nspaces] a');
+  page.navigation.manageNspaces = clickable(
+    '[data-test-nspace-menu] [data-test-nav-selector-footer-link]'
+  );
   page.navigation.manageNspacesIsVisible = is(
     ':checked',
     '[data-test-nspace-menu] > input[type="checkbox"]'
   );
   page.navigation.dcs = collection('[data-test-datacenter-menu] [data-test-dc-item]', {
-    name: clickable('a'),
+    name: clickable(),
   });
   return page;
 };
diff --git a/ui/packages/consul-ui/app/components/nav-selector/index.hbs b/ui/packages/consul-ui/app/components/nav-selector/index.hbs
index 54ca6c1db7a4..5b4538294233 100644
--- a/ui/packages/consul-ui/app/components/nav-selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/nav-selector/index.hbs
@@ -48,6 +48,7 @@
             @iconPosition='trailing'
             @icon='arrow-right'
             @color='secondary'
+            data-test-nav-selector-footer-link
           />
         </DD.Footer>
       {{/if}}