diff --git a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.test.tsx b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.test.tsx
index 219409b10be6c..f927173b144d6 100644
--- a/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/embeddables/embedded_map.test.tsx
@@ -7,7 +7,7 @@
 import { mount, ReactWrapper, shallow } from 'enzyme';
 import React from 'react';
 import * as redux from 'react-redux';
-import { act } from 'react-dom/test-utils';
+import { waitFor } from '@testing-library/react';
 
 import '../../../common/mock/match_media';
 import { useIndexPatterns } from '../../../common/hooks/use_index_patterns';
@@ -107,20 +107,19 @@ describe('EmbeddedMapComponent', () => {
 
     (createEmbeddable as jest.Mock).mockResolvedValue(mockCreateEmbeddable);
 
-    let wrapper: ReactWrapper;
-    await act(async () => {
-      wrapper = mount(
-        <TestProviders>
-          <EmbeddedMapComponent {...testProps} />
-        </TestProviders>
-      );
-    });
+    const wrapper: ReactWrapper = mount(
+      <TestProviders>
+        <EmbeddedMapComponent {...testProps} />
+      </TestProviders>
+    );
 
-    wrapper!.update();
+    await waitFor(() => {
+      wrapper.update();
 
-    expect(wrapper!.find('[data-test-subj="EmbeddablePanel"]').exists()).toEqual(true);
-    expect(wrapper!.find('[data-test-subj="IndexPatternsMissingPrompt"]').exists()).toEqual(false);
-    expect(wrapper!.find('[data-test-subj="loading-panel"]').exists()).toEqual(false);
+      expect(wrapper.find('[data-test-subj="EmbeddablePanel"]').exists()).toEqual(true);
+      expect(wrapper.find('[data-test-subj="IndexPatternsMissingPrompt"]').exists()).toEqual(false);
+      expect(wrapper.find('[data-test-subj="loading-panel"]').exists()).toEqual(false);
+    });
   });
 
   test('renders IndexPatternsMissingPrompt', async () => {
@@ -132,20 +131,18 @@ describe('EmbeddedMapComponent', () => {
 
     (createEmbeddable as jest.Mock).mockResolvedValue(mockCreateEmbeddable);
 
-    let wrapper: ReactWrapper;
-    await act(async () => {
-      wrapper = mount(
-        <TestProviders>
-          <EmbeddedMapComponent {...testProps} />
-        </TestProviders>
-      );
-    });
-
-    wrapper!.update();
+    const wrapper: ReactWrapper = mount(
+      <TestProviders>
+        <EmbeddedMapComponent {...testProps} />
+      </TestProviders>
+    );
+    await waitFor(() => {
+      wrapper.update();
 
-    expect(wrapper!.find('[data-test-subj="EmbeddablePanel"]').exists()).toEqual(false);
-    expect(wrapper!.find('[data-test-subj="IndexPatternsMissingPrompt"]').exists()).toEqual(true);
-    expect(wrapper!.find('[data-test-subj="loading-panel"]').exists()).toEqual(false);
+      expect(wrapper.find('[data-test-subj="EmbeddablePanel"]').exists()).toEqual(false);
+      expect(wrapper.find('[data-test-subj="IndexPatternsMissingPrompt"]').exists()).toEqual(true);
+      expect(wrapper.find('[data-test-subj="loading-panel"]').exists()).toEqual(false);
+    });
   });
 
   test('renders Loader', async () => {
@@ -154,19 +151,17 @@ describe('EmbeddedMapComponent', () => {
 
     (createEmbeddable as jest.Mock).mockResolvedValue(null);
 
-    let wrapper: ReactWrapper;
-    await act(async () => {
-      wrapper = mount(
-        <TestProviders>
-          <EmbeddedMapComponent {...testProps} />
-        </TestProviders>
-      );
-    });
-
-    wrapper!.update();
+    const wrapper: ReactWrapper = mount(
+      <TestProviders>
+        <EmbeddedMapComponent {...testProps} />
+      </TestProviders>
+    );
+    await waitFor(() => {
+      wrapper.update();
 
-    expect(wrapper!.find('[data-test-subj="EmbeddablePanel"]').exists()).toEqual(false);
-    expect(wrapper!.find('[data-test-subj="IndexPatternsMissingPrompt"]').exists()).toEqual(false);
-    expect(wrapper!.find('[data-test-subj="loading-panel"]').exists()).toEqual(true);
+      expect(wrapper.find('[data-test-subj="EmbeddablePanel"]').exists()).toEqual(false);
+      expect(wrapper.find('[data-test-subj="IndexPatternsMissingPrompt"]').exists()).toEqual(false);
+      expect(wrapper.find('[data-test-subj="loading-panel"]').exists()).toEqual(true);
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx
index d0cfbaccde7dd..31051a51a58d5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx
@@ -12,7 +12,7 @@ import { mockSelectedTimeline } from './mocks';
 import * as i18n from '../translations';
 
 import { ReactWrapper, mount } from 'enzyme';
-import { act } from 'react-dom/test-utils';
+import { waitFor } from '@testing-library/react';
 import { useParams } from 'react-router-dom';
 
 jest.mock('../translations', () => {
@@ -102,15 +102,14 @@ describe('TimelineDownloader', () => {
         ...defaultTestProps,
       };
 
-      await act(() => {
-        wrapper = mount(<TimelineDownloader {...testProps} />);
-      });
-
-      wrapper.update();
+      wrapper = mount(<TimelineDownloader {...testProps} />);
+      await waitFor(() => {
+        wrapper.update();
 
-      expect(mockDispatchToaster.mock.calls[0][0].title).toEqual(
-        i18n.SUCCESSFULLY_EXPORTED_TIMELINES
-      );
+        expect(mockDispatchToaster.mock.calls[0][0].title).toEqual(
+          i18n.SUCCESSFULLY_EXPORTED_TIMELINES
+        );
+      });
     });
 
     test('With correct toast message on success for exported templates', async () => {
@@ -119,15 +118,15 @@ describe('TimelineDownloader', () => {
       };
       (useParams as jest.Mock).mockReturnValue({ tabName: 'template' });
 
-      await act(() => {
-        wrapper = mount(<TimelineDownloader {...testProps} />);
-      });
+      wrapper = mount(<TimelineDownloader {...testProps} />);
 
-      wrapper.update();
+      await waitFor(() => {
+        wrapper.update();
 
-      expect(mockDispatchToaster.mock.calls[0][0].title).toEqual(
-        i18n.SUCCESSFULLY_EXPORTED_TIMELINES
-      );
+        expect(mockDispatchToaster.mock.calls[0][0].title).toEqual(
+          i18n.SUCCESSFULLY_EXPORTED_TIMELINES
+        );
+      });
     });
   });
 });