diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java
index 70f8913f60b..c337a1bce40 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java
@@ -122,6 +122,9 @@ public class ContentAssistTests extends BaseUITestCase {
         
         closeAllEditors();
 
+        // wait for indexer before deleting project to avoid errors in the log
+        CCorePlugin.getIndexManager().joinIndexer(10000, monitor);
+		
         IResource [] members = project.members();
         for (IResource member : members) {
             if( member.getName().equals( ".project" ) || member.getName().equals( ".cproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$