diff --git a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/ide/EdmView.java b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/ide/EdmView.java
index 086c3dcf19..ba2c0c9d76 100644
--- a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/ide/EdmView.java
+++ b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/ide/EdmView.java
@@ -9,6 +9,11 @@
  */
 package org.eclipse.dirigible.tests.framework.ide;
 
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.eclipse.dirigible.repository.api.IRepository;
+import org.eclipse.dirigible.repository.api.IRepositoryStructure;
 import org.eclipse.dirigible.tests.framework.browser.Browser;
 import org.eclipse.dirigible.tests.framework.browser.HtmlAttribute;
 import org.eclipse.dirigible.tests.framework.browser.HtmlElementType;
@@ -21,10 +26,12 @@ public class EdmView {
 
     private final Browser browser;
     private final WorkbenchFactory workbenchFactory;
+    private final IRepository repository;
 
-    public EdmView(Browser browser, WorkbenchFactory workbenchFactory) {
+    public EdmView(Browser browser, WorkbenchFactory workbenchFactory, IRepository repository) {
         this.browser = browser;
         this.workbenchFactory = workbenchFactory;
+        this.repository = repository;
     }
 
     public void regenerate(String projectName, String edmFileName) {
@@ -32,7 +39,16 @@ public void regenerate(String projectName, String edmFileName) {
         workbench.openFile(projectName, edmFileName);
 
         browser.clickOnElementByAttributePattern(HtmlElementType.BUTTON, HtmlAttribute.TITLE, "Regenerate");
-        browser.assertElementExistsByTypeAndContainsText(HtmlElementType.SPAN, "Generated from model");
+        // Wait for the DURABLE effect of the regeneration - the generated sources landing in the
+        // project's gen folder - not the transient "Generated from model" toast. On slow CI runners
+        // the cross-frame text sweep can outlast the toast, and the sweep's timeout fallback reloads
+        // the page, destroying it for good (failure screenshots showed the toast on screen and the
+        // gen folder already created while the assertion still failed - the recurring DependsOnIT
+        // flake that also hit master).
+        String genPath = IRepositoryStructure.PATH_USERS + "/admin/workspace/" + projectName + "/gen";
+        Awaitility.await()
+                  .atMost(120, TimeUnit.SECONDS)
+                  .pollInterval(1, TimeUnit.SECONDS)
+                  .until(() -> repository.hasCollection(genPath));
     }
 }
-