diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java
index 9ff17488f06..5db82078270 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java
@@ -2383,7 +2383,7 @@ public class IndexBugsTests extends BaseTestCase {
 	    };
 	    job.schedule();
 		job.join();
-		Thread.sleep(1000);
+		Thread.sleep(100);
 		waitForIndexer(fCProject);
 
 		index.acquireReadLock();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/DeltaAnalyzer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/DeltaAnalyzer.java
index ea1993788ce..ee79d6cf0bf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/DeltaAnalyzer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/DeltaAnalyzer.java
@@ -94,7 +94,10 @@ public class DeltaAnalyzer {
 				final int rdkind = rd.getKind();
 				if (rdkind != IResourceDelta.ADDED) {
 					IResource res= rd.getResource();
-					if (res instanceof IFile && handled.add(res)) {
+					if (!handled.add(res)) {
+						continue;
+					}
+					if (res instanceof IFile) {
 						switch (rdkind) {
 						case IResourceDelta.CHANGED:
 							if ((rd.getFlags() & IResourceDelta.CONTENT) != 0) {