diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
index 5ebb1d31739..9a065ad9a14 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
@@ -79,6 +79,8 @@ public class CProjectDescriptionStorageTests extends BaseTestCase {
 			for (IResource child : cProj.getProject().getFolder(".csettings").members())
 				child.setReadOnly(false);
 		}
+		// Wait for a few seconds for the indexer to get going so we avoid deadlock
+		Thread.sleep(2000);
 		// Delete the project
 		CProjectHelper.delete(cProj);
 	}