diff --git a/org.eclipse.xtext.ui.tests/src-longrunning/org/eclipse/xtext/ui/tests/editor/DirtyStateEditorSupportIntegrationTest.java b/org.eclipse.xtext.ui.tests/src-longrunning/org/eclipse/xtext/ui/tests/editor/DirtyStateEditorSupportIntegrationTest.java
index 7e5799bebb6..51708748a04 100644
--- a/org.eclipse.xtext.ui.tests/src-longrunning/org/eclipse/xtext/ui/tests/editor/DirtyStateEditorSupportIntegrationTest.java
+++ b/org.eclipse.xtext.ui.tests/src-longrunning/org/eclipse/xtext/ui/tests/editor/DirtyStateEditorSupportIntegrationTest.java
@@ -134,7 +134,7 @@ public void testUndoRedo() throws Exception {
 
 		Display.getDefault().readAndDispatch();
 		
-		assertNotEquals(document.get(), "");
+		assertNotEquals("", document.get());
 		assertTrue(editor.getDocumentProvider() instanceof FileDocumentProvider);
 		
 		FileDocumentProvider fileDocumentProvider = (FileDocumentProvider)editor.getDocumentProvider();
@@ -152,7 +152,10 @@ public void testUndoRedo() throws Exception {
 		Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_REFRESH, null);
 		syncUtil.yieldToQueuedDisplayJobs(new NullProgressMonitor());
 		
-		assertEquals(document.get(), "");
+		// This was added to avoid flakyness for testing on mac os
+		syncUtil.waitForReconciler(editor);
+		
+		assertEquals("", document.get());
 	}
 
 	/**