diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
index fb73bbe18eb..41af0bf470d 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
@@ -225,9 +225,11 @@ public class CodanTestCase extends BaseTestCase {
 			currentFile = testFile;
 			try {
 				cproject.getProject().refreshLocal(1, null);
+				waitForIndexer(cproject);
 			} catch (CoreException e) {
 				// hmm
 				fail(e.getMessage());
+			} catch (InterruptedException e) {
 			}
 			currentCElem = cproject.findElement(new Path(currentFile.toString()));
 			currentIFile = (IFile) currentCElem.getResource();