diff --git a/ui/app/templates/components/toolbar-link.hbs b/ui/app/templates/components/toolbar-link.hbs
index 9289c3ae3f..cf4f197aa9 100644
--- a/ui/app/templates/components/toolbar-link.hbs
+++ b/ui/app/templates/components/toolbar-link.hbs
@@ -1,5 +1,5 @@
 <LinkTo
-  @class="toolbar-link"
+  class="toolbar-link"
   @params={{params}}
   @data-test-secret-edit={{data-test-secret-edit}}
   @data-test-secondary-add={{data-test-secondary-add}}
diff --git a/ui/app/templates/components/toolbar-secret-link.hbs b/ui/app/templates/components/toolbar-secret-link.hbs
index db13edb5f6..bf35e61edd 100644
--- a/ui/app/templates/components/toolbar-secret-link.hbs
+++ b/ui/app/templates/components/toolbar-secret-link.hbs
@@ -1,7 +1,8 @@
 <SecretLink
-  @class="toolbar-link"
+  class="toolbar-link"
   @mode={{mode}}
   @secret={{secret}}
+  @replace={{replace}}
   @queryParams={{queryParams}}
   @data-test-edit-link={{data-test-edit-link}}
   @data-test-sign-link={{data-test-sign-link}}
@@ -11,7 +12,6 @@
   @data-test-backend-credentials={{data-test-backend-credentials}}
   @data-test-transit-action-link={{data-test-transit-action-link}}
   @data-test-transit-key-actions-link={{data-test-transit-key-actions-link}}
-  @replace={{replace}}
 >
   {{yield}}
   <ICon @glyph={{glyph}} @size=12 />
diff --git a/ui/app/templates/vault/cluster/auth.hbs b/ui/app/templates/vault/cluster/auth.hbs
index ef94573f99..b595ef7df7 100644
--- a/ui/app/templates/vault/cluster/auth.hbs
+++ b/ui/app/templates/vault/cluster/auth.hbs
@@ -6,7 +6,7 @@
   </Page.header>
   {{#if (has-feature "Namespaces")}}
     <Page.sub-header>
-      <Toolbar @class="toolbar-namespace-picker">
+      <Toolbar class="toolbar-namespace-picker">
         <div class="field is-horizontal">
           <div class="field-label is-normal">
             <label class="is-label" for="namespace">Namespace</label>
diff --git a/ui/tests/integration/components/toolbar-actions-test.js b/ui/tests/integration/components/toolbar-actions-test.js
index 29090b597d..8f5418a176 100644
--- a/ui/tests/integration/components/toolbar-actions-test.js
+++ b/ui/tests/integration/components/toolbar-actions-test.js
@@ -1,7 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import { isPresent } from 'ember-cli-page-object';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | toolbar-actions', function(hooks) {
@@ -11,6 +10,6 @@ module('Integration | Component | toolbar-actions', function(hooks) {
     await render(hbs`<ToolbarActions>These are the toolbar actions</ToolbarActions>`);
 
     assert.equal(this.element.textContent.trim(), 'These are the toolbar actions');
-    assert.ok(isPresent('.toolbar-actions'));
+    assert.dom('.toolbar-actions').exists();
   });
 });