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 f54b4606bf..be1c33da45 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
@@ -27,6 +27,7 @@
             </menu.Separator>
             {{#each menu.items as |item|}}
               <menu.Item
+                data-test-dc-item
                 aria-current={{if (eq @dc.Name item.Name) 'true'}}
                 class={{class-map
                   (array 'is-local' item.Local)
@@ -55,7 +56,9 @@
       </disclosure.Menu>
     </DisclosureMenu>
   {{else}}
-    <li class="dc-name" data-test-datacenter-single>{{@dcs.firstObject.Name}}</li>
+    <div class="dc-name" data-test-datacenter-single>
+      {{@dcs.firstObject.Name}}
+    </div>
   {{/if}}
 </li>
 
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 aa0e1d5724..3bdada40e3 100644
--- a/ui/packages/consul-ui/app/components/hashicorp-consul/pageobject.js
+++ b/ui/packages/consul-ui/app/components/hashicorp-consul/pageobject.js
@@ -50,7 +50,7 @@ export default (collection, clickable, attribute, is, authForm, emptyState) => s
     ':checked',
     '[data-test-nspace-menu] > input[type="checkbox"]'
   );
-  page.navigation.dcs = collection('[data-test-datacenter-menu] li', {
+  page.navigation.dcs = collection('[data-test-datacenter-menu] [data-test-dc-item]', {
     name: clickable('a'),
   });
   return page;
diff --git a/ui/packages/consul-ui/tests/integration/components/hashicorp-consul-test.js b/ui/packages/consul-ui/tests/integration/components/hashicorp-consul-test.js
index 58a75c94be..2f611c5522 100644
--- a/ui/packages/consul-ui/tests/integration/components/hashicorp-consul-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/hashicorp-consul-test.js
@@ -1,7 +1,6 @@
-import { module, skip, test } from 'qunit';
+import { module, skip } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
-import { render } from '@ember/test-helpers';
 
 module('Integration | Component | hashicorp consul', function(hooks) {
   setupRenderingTest(hooks);