diff --git a/packages/query-core/src/__tests__/query.test.tsx b/packages/query-core/src/__tests__/query.test.tsx
index 25ee912637..34477c12b2 100644
--- a/packages/query-core/src/__tests__/query.test.tsx
+++ b/packages/query-core/src/__tests__/query.test.tsx
@@ -501,15 +501,14 @@ describe('query', () => {
     })
     const unsubscribe1 = observer.subscribe(() => undefined)
     unsubscribe1()
-    await vi.waitFor(() =>
-      expect(queryCache.find({ queryKey: key })).toBeUndefined(),
-    )
+
+    await vi.advanceTimersByTimeAsync(0)
+    expect(queryCache.find({ queryKey: key })).toBeUndefined()
     const unsubscribe2 = observer.subscribe(() => undefined)
     unsubscribe2()
 
-    await vi.waitFor(() =>
-      expect(queryCache.find({ queryKey: key })).toBeUndefined(),
-    )
+    await vi.advanceTimersByTimeAsync(0)
+    expect(queryCache.find({ queryKey: key })).toBeUndefined()
     expect(count).toBe(1)
   })
 
@@ -524,9 +523,9 @@ describe('query', () => {
     const unsubscribe = observer.subscribe(() => undefined)
     expect(queryCache.find({ queryKey: key })).toBeDefined()
     unsubscribe()
-    await vi.waitFor(() =>
-      expect(queryCache.find({ queryKey: key })).toBeUndefined(),
-    )
+
+    await vi.advanceTimersByTimeAsync(0)
+    expect(queryCache.find({ queryKey: key })).toBeUndefined()
   })
 
   test('should be garbage collected later when unsubscribed and query is fetching', async () => {
@@ -544,9 +543,8 @@ describe('query', () => {
     // unsubscribe should not remove even though gcTime has elapsed b/c query is still fetching
     expect(queryCache.find({ queryKey: key })).toBeDefined()
     // should be removed after an additional staleTime wait
-    await vi.waitFor(() =>
-      expect(queryCache.find({ queryKey: key })).toBeUndefined(),
-    )
+    await vi.advanceTimersByTimeAsync(30)
+    expect(queryCache.find({ queryKey: key })).toBeUndefined()
   })
 
   test('should not be garbage collected unless there are no subscribers', async () => {
@@ -887,12 +885,11 @@ describe('query', () => {
 
     queryClient.setQueryData(key, 'data')
 
-    await vi.waitFor(() =>
-      expect(fn).toHaveBeenCalledWith(
-        expect.objectContaining({
-          type: 'removed',
-        }),
-      ),
+    await vi.advanceTimersByTimeAsync(10)
+    expect(fn).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: 'removed',
+      }),
     )
 
     expect(queryClient.getQueryCache().findAll()).toHaveLength(0)