diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java
index f9b7bf4173d..8a748f32179 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java
@@ -82,11 +82,11 @@ public class CheckerTestCase extends CodanTestCase {
 
 	public void loadCodeAndRun(String code) {
 		loadcode(code);
-		 runOnProject();
+		runCodan();
 	}
 	public void loadCodeAndRunCpp(String code) {
 		loadcode(code, true);
-		 runOnProject();
+		runCodan();
 	}
 	/**
 	 * 
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 491466010f1..cb82fb3067a 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
@@ -120,12 +120,7 @@ public class CodanTestCase extends BaseTestCase {
 				}
 			}, null);
 			mj.join();
-			// Index the cproject
-			CCorePlugin.getIndexManager().setIndexerId(cprojects[0],
-					IPDOMManager.ID_FAST_INDEXER);
-			// wait until the indexer is done
-			assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000,
-					new NullProgressMonitor()));
+
 		} finally {
 			mj.dispose();
 		}
@@ -142,6 +137,7 @@ public class CodanTestCase extends BaseTestCase {
 		// Index the cproject
 		CCorePlugin.getIndexManager().setIndexerId(cproject,
 				IPDOMManager.ID_FAST_INDEXER);
+		CCorePlugin.getIndexManager().reindex(cproject);
 		// wait until the indexer is done
 		assertTrue(CCorePlugin.getIndexManager().joinIndexer(1000 * 60, // 1 min
 				new NullProgressMonitor()));
@@ -191,7 +187,7 @@ public class CodanTestCase extends BaseTestCase {
 	}
 
 	public File loadcode(String code, boolean cpp) {
-		String ext = cpp ? ".cc" : ".c"; //$NON-NLS-1$ //$NON-NLS-2$
+		String ext = cpp ? ".cpp" : ".c"; //$NON-NLS-1$ //$NON-NLS-2$
 		File testFile = null;
 		try {
 			testFile = File.createTempFile("test", ext, tmpDir); //$NON-NLS-1$