diff --git a/x-pack/plugins/graph/public/components/search_bar.test.tsx b/x-pack/plugins/graph/public/components/search_bar.test.tsx
index de9598b52087e..780a0c918a47a 100644
--- a/x-pack/plugins/graph/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/graph/public/components/search_bar.test.tsx
@@ -198,7 +198,7 @@ describe('search_bar', () => {
 
     // pick the button component out of the tree because
     // it's part of a popover and thus not covered by enzyme
-    instance.find('[data-test-subj="graphDatasourceButton"]').first().simulate('click');
+    instance.find('button[data-test-subj="graphDatasourceButton"]').first().simulate('click');
 
     expect(openSourceModal).toHaveBeenCalled();
   });
diff --git a/x-pack/plugins/graph/public/components/settings/settings.test.tsx b/x-pack/plugins/graph/public/components/settings/settings.test.tsx
index 96d5a2a5b2bac..a8da08be6d42d 100644
--- a/x-pack/plugins/graph/public/components/settings/settings.test.tsx
+++ b/x-pack/plugins/graph/public/components/settings/settings.test.tsx
@@ -267,7 +267,7 @@ describe('settings', () => {
     });
 
     it('should delete all nodes', () => {
-      instance.find('[data-test-subj="graphUnblocklistAll"]').find(EuiButton).simulate('click');
+      instance.find('button[data-test-subj="graphUnblocklistAll"]').simulate('click');
 
       expect(workspaceProps.unblockAll).toHaveBeenCalled();
     });
@@ -314,7 +314,7 @@ describe('settings', () => {
 
     it('should add url template', async () => {
       act(() => {
-        instance.find('EuiButton[data-test-subj="graphAddNewTemplate"]').simulate('click');
+        instance.find('button[data-test-subj="graphAddNewTemplate"]').simulate('click');
       });
       instance.update();