diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java
index 851c30f8a34..4cc5c2f14d2 100644
--- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java
+++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/reconciler/AbstractReconcilerTest.java
@@ -482,9 +482,9 @@ void installDocument() throws InterruptedException {
 	}
 
 	void pollUntilClean() throws InterruptedException {
-		// wait for reconciler to become clean
+		// the worker clears the dirty flag before the active flag, so wait for both
 		long start= System.currentTimeMillis();
-		while (isDirty()) {
+		while (isDirty() || isActive()) {
 			long current= System.currentTimeMillis();
 			if (current > start + 5000)
 				fail("waited > 5s for reconciler to complete");