diff --git a/src/frontend/tests/core/unit/keyPairListComponent.spec.ts b/src/frontend/tests/core/unit/keyPairListComponent.spec.ts
index 30b80e813..f0600080b 100644
--- a/src/frontend/tests/core/unit/keyPairListComponent.spec.ts
+++ b/src/frontend/tests/core/unit/keyPairListComponent.spec.ts
@@ -25,7 +25,9 @@ test(
 
     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"]', {
@@ -35,7 +37,9 @@ test(
     await page.getByTestId("sidebar-search-input").click();
     await page.getByTestId("sidebar-search-input").fill("amazon bedrock");
 
-    await page.waitForTimeout(1000);
+    await page.waitForSelector('[data-testid="modelsAmazon Bedrock"]', {
+      timeout: 3000,
+    });
 
     await page
       .getByTestId("modelsAmazon Bedrock")