diff --git a/ui/admin/tests/acceptance/auth-methods/create-test.js b/ui/admin/tests/acceptance/auth-methods/create-test.js
index fe8c03782..9cb4466d5 100644
--- a/ui/admin/tests/acceptance/auth-methods/create-test.js
+++ b/ui/admin/tests/acceptance/auth-methods/create-test.js
@@ -494,7 +494,7 @@ module('Acceptance | auth-methods | create', function (hooks) {
     );
     await visit(urls.authMethods);
 
-    await click(selectors.TABLE_FIRST_ROW_ACTION_DROPDOWN);
+    await click(commonSelectors.TABLE_FIRST_ROW_ACTION_DROPDOWN);
     assert.dom(selectors.TABLE_FIRST_ROW_ACTION_FIRST_ITEM).isVisible();
     await click(selectors.TABLE_FIRST_ROW_ACTION_FIRST_ITEM);
 
@@ -506,7 +506,7 @@ module('Acceptance | auth-methods | create', function (hooks) {
       'Primary auth method is set.',
     );
 
-    await click(selectors.TABLE_FIRST_ROW_ACTION_DROPDOWN);
+    await click(commonSelectors.TABLE_FIRST_ROW_ACTION_DROPDOWN);
     await click(selectors.TABLE_FIRST_ROW_ACTION_FIRST_ITEM);
 
     scope = this.server.schema.scopes.find(instances.orgScope.id);
diff --git a/ui/admin/tests/acceptance/auth-methods/selectors.js b/ui/admin/tests/acceptance/auth-methods/selectors.js
index 1dc0cef33..abafef2ec 100644
--- a/ui/admin/tests/acceptance/auth-methods/selectors.js
+++ b/ui/admin/tests/acceptance/auth-methods/selectors.js
@@ -102,8 +102,6 @@ export const MANAGE_DROPDOWN_MAKE_PRIMARY =
 export const MANAGE_DROPDOWN_DELETE =
   '[data-test-manage-auth-method] ul li:last-child button';
 
-export const TABLE_FIRST_ROW_ACTION_DROPDOWN =
-  'tbody tr:first-child td:last-child button';
 export const TABLE_FIRST_ROW_ACTION_FIRST_ITEM =
   'tbody tr:first-child td:last-child ul li:first-child button';
 
diff --git a/ui/admin/tests/acceptance/storage-buckets/list-test.js b/ui/admin/tests/acceptance/storage-buckets/list-test.js
index 8bdad990d..7e52f8406 100644
--- a/ui/admin/tests/acceptance/storage-buckets/list-test.js
+++ b/ui/admin/tests/acceptance/storage-buckets/list-test.js
@@ -94,7 +94,7 @@ module('Acceptance | storage-buckets | list', function (hooks) {
       ].includes('create'),
     );
     assert
-      .dom(commonSelectors.SIDEBAR_NAV_LINK(urls.storageBuckets))
+      .dom(commonSelectors.GENERAL_SIDEBAR_NAV_LINK(urls.storageBuckets))
       .doesNotExist();
 
     // Tests that correct message is displayed when no buckets exist
@@ -177,7 +177,7 @@ module('Acceptance | storage-buckets | list', function (hooks) {
     await visit(urls.globalScope);
     assert.false(featuresService.isEnabled('ssh-session-recording'));
     assert
-      .dom(commonSelectors.SIDEBAR_NAV_LINK(urls.storageBuckets))
+      .dom(commonSelectors.GENERAL_SIDEBAR_NAV_LINK(urls.storageBuckets))
       .doesNotExist();
   });
 
@@ -190,7 +190,7 @@ module('Acceptance | storage-buckets | list', function (hooks) {
     urls.storageBucket = `${urls.storageBuckets}/${instances.storageBucket.id}`;
 
     await click(commonSelectors.HREF(urls.storageBuckets));
-    await click(selectors.TABLE_FIRST_ROW_ACTION_DROPDOWN);
+    await click(commonSelectors.TABLE_FIRST_ROW_ACTION_DROPDOWN);
 
     assert.dom(selectors.TABLE_FIRST_ROW_ACTION_FIRST_ITEM).exists();
     assert.dom(selectors.TABLE_FIRST_ROW_ACTION_FIRST_ITEM).hasText('Edit');
diff --git a/ui/admin/tests/acceptance/storage-buckets/selectors.js b/ui/admin/tests/acceptance/storage-buckets/selectors.js
index 2448d7a45..4d44465a5 100644
--- a/ui/admin/tests/acceptance/storage-buckets/selectors.js
+++ b/ui/admin/tests/acceptance/storage-buckets/selectors.js
@@ -36,7 +36,5 @@ export const EDITOR_WORKER_FILTER_VALUE = '"dev" in "/tags/env"';
 export const TOAST = '[role=alert] div';
 export const TOAST_SUCCESSFUL_VALUE = 'Saved successfully.';
 
-export const TABLE_FIRST_ROW_ACTION_DROPDOWN =
-  'tbody tr:first-child td:last-child button';
 export const TABLE_FIRST_ROW_ACTION_FIRST_ITEM =
   'tbody tr:first-child td:last-child ul li:first-child a';
diff --git a/ui/admin/tests/helpers/selectors.js b/ui/admin/tests/helpers/selectors.js
index 1ed5cf00d..396c95b24 100644
--- a/ui/admin/tests/helpers/selectors.js
+++ b/ui/admin/tests/helpers/selectors.js
@@ -35,7 +35,8 @@ export const PAGE_MESSAGE_LINK =
 
 export const HREF = (url) => `[href="${url}"]`;
 
-export const SIDEBAR_NAV_LINK = (url) => `[title="General"] a[href="${url}"]`;
+export const GENERAL_SIDEBAR_NAV_LINK = (url) =>
+  `[title="General"] a[href="${url}"]`;
 export const RESOURCES_SIDEBAR_NAV_LINK = (url) =>
   `[title="Resources"] a[href="${url}"]`;