diff --git a/packages/core/upload/admin/src/hooks/tests/useFolderStructure.test.js b/packages/core/upload/admin/src/hooks/tests/useFolderStructure.test.js
index 3775698c60..2e0d1e28c7 100644
--- a/packages/core/upload/admin/src/hooks/tests/useFolderStructure.test.js
+++ b/packages/core/upload/admin/src/hooks/tests/useFolderStructure.test.js
@@ -61,15 +61,17 @@ describe('useFolderStructure', () => {
   });
 
   test('fetches data from the right URL', async () => {
-    await setup();
+    const { waitForNextUpdate } = await setup();
+
+    await waitForNextUpdate();
 
     expect(axiosInstance.get).toBeCalledWith('/upload/folder-structure');
   });
 
   test('transforms the required object keys', async () => {
-    const { result, waitFor } = await setup({});
+    const { result, waitForNextUpdate } = await setup({});
 
-    await waitFor(() => result.current.isSuccess);
+    await waitForNextUpdate();
 
     expect(result.current.data).toStrictEqual([
       {