diff --git a/integration-tests/src/test/java/csep/backlog/BaseTest.java b/integration-tests/src/test/java/csep/backlog/BaseTest.java
index cd999bb..423264a 100644
--- a/integration-tests/src/test/java/csep/backlog/BaseTest.java
+++ b/integration-tests/src/test/java/csep/backlog/BaseTest.java
@@ -68,6 +68,7 @@ public abstract class BaseTest extends ApplicationTest {
     @AfterEach
     public void tearDown() throws Exception {
         FxToolkit.cleanupStages();
+        WaitForAsyncUtils.waitForFxEvents();
     }
 }
 
diff --git a/integration-tests/src/test/java/csep/backlog/basic/CRUDTest.java b/integration-tests/src/test/java/csep/backlog/basic/CRUDTest.java
index 7796d46..75fa30c 100644
--- a/integration-tests/src/test/java/csep/backlog/basic/CRUDTest.java
+++ b/integration-tests/src/test/java/csep/backlog/basic/CRUDTest.java
@@ -40,8 +40,10 @@ public class CRUDTest extends BaseTest {
     }
     @Test
     public void changeRecipeNameDoesChangeName() {
+        WaitForAsyncUtils.waitForFxEvents();
         ListView<Recipe> list = lookup("#recipeList").query();
         clickOn("#addRecipeButton");
+        WaitForAsyncUtils.waitForFxEvents();
         write("TEST_RECIPE");
         type(KeyCode.ENTER);
         WaitForAsyncUtils.waitForFxEvents();