diff --git a/src/frontend/tests/core/features/globalVariables.spec.ts b/src/frontend/tests/core/features/globalVariables.spec.ts
index 00dfc6211..f37a25d25 100644
--- a/src/frontend/tests/core/features/globalVariables.spec.ts
+++ b/src/frontend/tests/core/features/globalVariables.spec.ts
@@ -24,7 +24,9 @@ test("user must be able to save or delete a global variable", async ({
 
   while (modalCount === 0) {
     await page.getByText("New Flow", { exact: true }).click();
-    await page.waitForTimeout(3000);
+    await page.waitForSelector('[data-testid="modal-title"]', {
+      timeout: 3000,
+    });
     modalCount = await page.getByTestId("modal-title")?.count();
   }
   await page.waitForSelector('[data-testid="blank-flow"]', {
@@ -34,7 +36,9 @@ test("user must be able to save or delete a global variable", async ({
   await page.getByTestId("sidebar-search-input").click();
   await page.getByTestId("sidebar-search-input").fill("openai");
 
-  await page.waitForTimeout(1000);
+  await page.waitForSelector('[data-testid="modelsOpenAI"]', {
+    timeout: 1000,
+  });
 
   await page
     .getByTestId("modelsOpenAI")
@@ -82,7 +86,6 @@ test("user must be able to save or delete a global variable", async ({
   await page.getByText("Save Variable", { exact: true }).click();
   expect(page.getByText(credentialName, { exact: true })).not.toBeNull();
   await page.getByText(credentialName, { exact: true }).isVisible();
-  await page.waitForTimeout(1000);
 
   await page
     .getByText(credentialName, { exact: true })