diff --git a/x-pack/plugins/observability_solution/infra/public/components/asset_details/tabs/metadata/add_metadata_filter_button.tsx b/x-pack/plugins/observability_solution/infra/public/components/asset_details/tabs/metadata/add_metadata_filter_button.tsx
index f1e0b9073c036..49dfd3d42d5c4 100644
--- a/x-pack/plugins/observability_solution/infra/public/components/asset_details/tabs/metadata/add_metadata_filter_button.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/components/asset_details/tabs/metadata/add_metadata_filter_button.tsx
@@ -90,7 +90,7 @@ export const AddMetadataFilterButton = ({ item }: AddMetadataFilterButtonProps)
   }
 
   return (
-    <span>
+    <span data-test-subj={`infraAssetDetailsMetadataField.${item.name}`}>
       <EuiToolTip
         content={i18n.translate('xpack.infra.metadataEmbeddable.setFilterByValueTooltip', {
           defaultMessage: 'Filter by value',
diff --git a/x-pack/test/functional/page_objects/asset_details.ts b/x-pack/test/functional/page_objects/asset_details.ts
index 95a7819fb11a6..7ce90d213d234 100644
--- a/x-pack/test/functional/page_objects/asset_details.ts
+++ b/x-pack/test/functional/page_objects/asset_details.ts
@@ -180,7 +180,9 @@ export function AssetDetailsProvider({ getService }: FtrProviderContext) {
     },
 
     async clickAddMetadataFilter() {
-      return testSubjects.click('infraAssetDetailsMetadataAddFilterButton');
+      // Make this selector tied to the field to avoid flakiness
+      // https://github.com/elastic/kibana/issues/191565
+      return testSubjects.click('infraAssetDetailsMetadataField.host.name');
     },
 
     async clickRemoveMetadataFilter() {