diff --git a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/components/search_suggestion.vue b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/components/search_suggestion.vue
index f07705420170d89046883ae87a454d7d67d148aa..d5abd1ade79e58633872d0861151ac5b7b9b4efb 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/components/search_suggestion.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/components/search_suggestion.vue
@@ -20,14 +20,6 @@ export default {
       type: String,
       required: true,
     },
-    /**
-     * The name of the token. Used for data test ids.
-     */
-    name: {
-      type: String,
-      default: '',
-      required: false,
-    },
     selected: {
       type: Boolean,
       required: true,
@@ -42,12 +34,11 @@ export default {
 </script>
 <template>
   <gl-filtered-search-suggestion :value="value">
-    <div :data-testid="`${name}-search-token-suggestion-${value}`" class="gl-flex gl-items-center">
+    <div class="gl-flex gl-items-center">
       <gl-icon
         name="check"
         class="gl-mr-3 gl-shrink-0 gl-text-gray-700"
         :class="{ 'gl-invisible': !selected }"
-        :data-testid="`${name}-icon-${value}`"
       />
       <gl-truncate v-if="truncate" position="middle" :text="text" />
       <template v-else>{{ text }}</template>
diff --git a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/project_token.vue b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/project_token.vue
index 7fecb0141d73f1aa961fd5baeb77efcfd5af6fd4..2c17e8ca6390db71754b69e375ece378978e1095 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/project_token.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/project_token.vue
@@ -189,7 +189,7 @@ export default {
             :value="project.rawId"
             :text="project.name"
             :selected="isProjectSelected(project.rawId)"
-            name="project"
+            :data-testid="`suggestion-${project.rawId}`"
           />
         </template>
       </template>
diff --git a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/status_token.vue b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/status_token.vue
index 5841d1777047ac0f213f0b9ce8d66d70b9080e66..fa4497723291d781a10473ce28f86b590096ab1f 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/status_token.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/status_token.vue
@@ -198,7 +198,6 @@ export default {
           :value="status.value"
           :selected="isStatusSelected(status.value)"
           :data-testid="`suggestion-${status.value}`"
-          name="status"
         />
         <gl-dropdown-divider />
         <gl-dropdown-section-header>{{
@@ -211,7 +210,6 @@ export default {
           :value="status.value"
           :selected="isStatusSelected(status.value)"
           :data-testid="`suggestion-${status.value}`"
-          name="status"
         />
       </template>
     </gl-filtered-search-token>
diff --git a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/tool_token.vue b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/tool_token.vue
index f2ba5c4517c86a7a1965e8c29a2a83a9f66613cd..87595e6a8c260a3dae2a407844a6d35a98be89f6 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/tool_token.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/tool_token.vue
@@ -229,7 +229,6 @@ export default {
             :value="tool.value"
             :selected="isToolSelected(tool.value)"
             :data-testid="`suggestion-${tool.value}`"
-            name="tool"
           />
         </template>
         <template v-for="(group, index) in items" v-else>
@@ -244,7 +243,6 @@ export default {
             :value="tool.value"
             :selected="isToolSelected(tool.value)"
             :data-testid="`suggestion-${tool.value}`"
-            name="tool"
           />
         </template>
       </template>
diff --git a/ee/spec/frontend/security_dashboard/components/shared/filtered_search/components/search_suggestion_spec.js b/ee/spec/frontend/security_dashboard/components/shared/filtered_search/components/search_suggestion_spec.js
index 134d043ab4b8f8b492657f496aaec0aa28f866f4..afbb784256a228f4882093a86b57136bcbff3fd0 100644
--- a/ee/spec/frontend/security_dashboard/components/shared/filtered_search/components/search_suggestion_spec.js
+++ b/ee/spec/frontend/security_dashboard/components/shared/filtered_search/components/search_suggestion_spec.js
@@ -1,4 +1,4 @@
-import { GlFilteredSearchSuggestion, GlTruncate } from '@gitlab/ui';
+import { GlFilteredSearchSuggestion, GlTruncate, GlIcon } from '@gitlab/ui';
 import SearchSuggestion from 'ee/security_dashboard/components/shared/filtered_search/components/search_suggestion.vue';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 
@@ -27,14 +27,13 @@ describe('Search Suggestion', () => {
     createWrapper({
       text: 'My text',
       value: 'my_value',
-      name: 'test',
       selected,
     });
 
     expect(wrapper.findComponent(SearchSuggestion).exists()).toBe(true);
     expect(wrapper.findByText('My text').exists()).toBe(true);
     expect(findGlSearchSuggestion().props('value')).toBe('my_value');
-    expect(wrapper.findByTestId('test-icon-my_value').classes('gl-invisible')).toBe(!selected);
+    expect(wrapper.findComponent(GlIcon).classes('gl-invisible')).toBe(!selected);
   });
 
   it.each`