diff --git a/packages/kbn-react-hooks/src/use_boolean/use_boolean.test.ts b/packages/kbn-react-hooks/src/use_boolean/use_boolean.test.ts
index 8d5583e926bac..9711d54823d35 100644
--- a/packages/kbn-react-hooks/src/use_boolean/use_boolean.test.ts
+++ b/packages/kbn-react-hooks/src/use_boolean/use_boolean.test.ts
@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { act, cleanup, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act, cleanup } from '@testing-library/react';
 
 import { useBoolean } from './use_boolean';
 
diff --git a/x-pack/plugins/fields_metadata/public/hooks/use_fields_metadata/use_fields_metadata.test.ts b/x-pack/plugins/fields_metadata/public/hooks/use_fields_metadata/use_fields_metadata.test.ts
index eaae7c5542c0b..8f69c11a10432 100644
--- a/x-pack/plugins/fields_metadata/public/hooks/use_fields_metadata/use_fields_metadata.test.ts
+++ b/x-pack/plugins/fields_metadata/public/hooks/use_fields_metadata/use_fields_metadata.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
 
 import { createUseFieldsMetadataHook, UseFieldsMetadataParams } from './use_fields_metadata';
 import { FindFieldsMetadataResponsePayload } from '../../../common/latest';
@@ -46,12 +46,12 @@ describe('useFieldsMetadata', () => {
 
   it('should return the fieldsMetadata value from the API', async () => {
     fieldsMetadataClient.find.mockResolvedValue(mockedFieldsMetadataResponse);
-    const { result, waitForNextUpdate } = renderHook(() => useFieldsMetadata());
+    const { result } = renderHook(() => useFieldsMetadata());
 
     expect(result.current.loading).toBe(true);
     expect(result.current.fieldsMetadata).toEqual(undefined);
 
-    await waitForNextUpdate();
+    await waitFor(() => new Promise((resolve) => resolve(null)));
 
     const { fieldsMetadata, loading, error } = result.current;
     expect(fieldsMetadata).toEqual(fields);
@@ -68,21 +68,17 @@ describe('useFieldsMetadata', () => {
       dataset: 'dataset_name',
     };
 
-    const { waitForNextUpdate } = renderHook(() => useFieldsMetadata(params));
+    renderHook(() => useFieldsMetadata(params));
 
-    await waitForNextUpdate();
-
-    expect(fieldsMetadataClient.find).toHaveBeenCalledWith(params);
+    await waitFor(() => expect(fieldsMetadataClient.find).toHaveBeenCalledWith(params));
   });
 
   it('should return an error if the API call fails', async () => {
     const error = new Error('Fetch fields metadata Failed');
     fieldsMetadataClient.find.mockRejectedValueOnce(error);
 
-    const { result, waitForNextUpdate } = renderHook(() => useFieldsMetadata());
-
-    await waitForNextUpdate();
+    const { result } = renderHook(() => useFieldsMetadata());
 
-    expect(result.current.error?.message).toMatch(error.message);
+    await waitFor(() => expect(result.current.error?.message).toMatch(error.message));
   });
 });
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_summary/log_summary.test.tsx b/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_summary/log_summary.test.tsx
index 183950edf9777..8635df14731a5 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_summary/log_summary.test.tsx
+++ b/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_summary/log_summary.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { renderHook } from '@testing-library/react-hooks';
+import { waitFor, renderHook } from '@testing-library/react';
 // We are using this inside a `jest.mock` call. Jest requires dynamic dependencies to be prefixed with `mock`
 import { coreMock as mockCoreMock } from '@kbn/core/public/mocks';
 
@@ -56,14 +56,14 @@ describe('useLogSummary hook', () => {
       .mockResolvedValueOnce(firstMockResponse)
       .mockResolvedValueOnce(secondMockResponse);
 
-    const { result, waitForNextUpdate, rerender } = renderHook(
+    const { result, rerender } = renderHook(
       ({ logViewReference }) => useLogSummary(logViewReference, startTimestamp, endTimestamp, null),
       {
         initialProps: { logViewReference: LOG_VIEW_REFERENCE },
       }
     );
 
-    await waitForNextUpdate();
+    await waitFor(() => new Promise((resolve) => resolve(null)));
 
     expect(fetchLogSummaryMock).toHaveBeenCalledTimes(1);
     expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
@@ -75,7 +75,7 @@ describe('useLogSummary hook', () => {
     expect(result.current.buckets).toEqual(firstMockResponse.data.buckets);
 
     rerender({ logViewReference: CHANGED_LOG_VIEW_REFERENCE });
-    await waitForNextUpdate();
+    await waitFor(() => new Promise((resolve) => resolve(null)));
 
     expect(fetchLogSummaryMock).toHaveBeenCalledTimes(2);
     expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
@@ -101,7 +101,7 @@ describe('useLogSummary hook', () => {
       .mockResolvedValueOnce(firstMockResponse)
       .mockResolvedValueOnce(secondMockResponse);
 
-    const { result, waitForNextUpdate, rerender } = renderHook(
+    const { result, rerender } = renderHook(
       ({ filterQuery }) =>
         useLogSummary(LOG_VIEW_REFERENCE, startTimestamp, endTimestamp, filterQuery),
       {
@@ -109,7 +109,7 @@ describe('useLogSummary hook', () => {
       }
     );
 
-    await waitForNextUpdate();
+    await waitFor(() => new Promise((resolve) => resolve(null)));
 
     expect(fetchLogSummaryMock).toHaveBeenCalledTimes(1);
     expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
@@ -121,7 +121,7 @@ describe('useLogSummary hook', () => {
     expect(result.current.buckets).toEqual(firstMockResponse.data.buckets);
 
     rerender({ filterQuery: 'CHANGED_FILTER_QUERY' });
-    await waitForNextUpdate();
+    await waitFor(() => new Promise((resolve) => resolve(null)));
 
     expect(fetchLogSummaryMock).toHaveBeenCalledTimes(2);
     expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
@@ -139,7 +139,7 @@ describe('useLogSummary hook', () => {
       .mockResolvedValueOnce(createMockResponse([]));
 
     const firstRange = createMockDateRange();
-    const { waitForNextUpdate, rerender } = renderHook(
+    const { rerender } = renderHook(
       ({ startTimestamp, endTimestamp }) =>
         useLogSummary(LOG_VIEW_REFERENCE, startTimestamp, endTimestamp, null),
       {
@@ -147,7 +147,7 @@ describe('useLogSummary hook', () => {
       }
     );
 
-    await waitForNextUpdate();
+    await waitFor(() => new Promise((resolve) => resolve(null)));
     expect(fetchLogSummaryMock).toHaveBeenCalledTimes(1);
     expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
@@ -160,7 +160,7 @@ describe('useLogSummary hook', () => {
     const secondRange = createMockDateRange('now-20s', 'now');
 
     rerender(secondRange);
-    await waitForNextUpdate();
+    await waitFor(() => new Promise((resolve) => resolve(null)));
 
     expect(fetchLogSummaryMock).toHaveBeenCalledTimes(2);
     expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
@@ -176,7 +176,7 @@ describe('useLogSummary hook', () => {
     fetchLogSummaryMock.mockResolvedValueOnce(createMockResponse([]));
 
     const firstRange = createMockDateRange();
-    const { waitForNextUpdate, rerender } = renderHook(
+    const { rerender } = renderHook(
       ({ startTimestamp, endTimestamp }) =>
         useLogSummary(LOG_VIEW_REFERENCE, startTimestamp, endTimestamp, null),
       {
@@ -188,7 +188,7 @@ describe('useLogSummary hook', () => {
 
     // intentionally don't wait for an update to test the throttling
     rerender(secondRange);
-    await waitForNextUpdate();
+    await waitFor(() => new Promise((resolve) => resolve(null)));
 
     expect(fetchLogSummaryMock).toHaveBeenCalledTimes(1);
     expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_data_search_request.test.tsx b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_data_search_request.test.tsx
index 33369c1125e15..08907b1627086 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_data_search_request.test.tsx
+++ b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_data_search_request.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
 import React from 'react';
 import { firstValueFrom, Observable, of, Subject } from 'rxjs';
 import type { ISearchGeneric, IKibanaSearchResponse } from '@kbn/search-types';
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_latest_partial_data_search_response.test.tsx b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_latest_partial_data_search_response.test.tsx
index a4b01be03d80b..24433f23bc677 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_latest_partial_data_search_response.test.tsx
+++ b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_latest_partial_data_search_response.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, act } from '@testing-library/react';
 import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
 import { IKibanaSearchRequest } from '@kbn/search-types';
 import { ParsedDataSearchRequestDescriptor, ParsedKibanaSearchResponse } from './types';