diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java
index 805e6e1ad7d..98f15540e02 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java
@@ -55,7 +55,6 @@ public class IndexIncludeTest extends IndexTestBase {
 
 	public static TestSuite suite() {
 		TestSuite suite = suite(IndexIncludeTest.class, "_");
-		suite.addTest(new IndexIncludeTest("deleteProject"));
 		return suite;
 	}
 
@@ -69,28 +68,22 @@ public class IndexIncludeTest extends IndexTestBase {
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		if (fProject == null) {
-			fProject = createProject(true, "resources/indexTests/includes");
-			IPathEntry[] entries = new IPathEntry[] {
-					CoreModel.newIncludeEntry(fProject.getPath(), null, fProject.getResource().getLocation()) };
-			fProject.setRawPathEntries(entries, npm());
-			IndexerPreferences.set(fProject.getProject(), IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG,
-					"false");
-		}
+		fProject = createProject(true, "resources/indexTests/includes");
+		IPathEntry[] entries = new IPathEntry[] {
+				CoreModel.newIncludeEntry(fProject.getPath(), null, fProject.getResource().getLocation()) };
+		fProject.setRawPathEntries(entries, npm());
+		IndexerPreferences.set(fProject.getProject(), IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG,
+				"false");
+
 		fIndex = CCorePlugin.getIndexManager().getIndex(fProject);
 	}
 
 	@Override
 	public void tearDown() throws Exception {
+		CProjectHelper.delete(fProject);
 		super.tearDown();
 	}
 
-	public void deleteProject() {
-		if (fProject != null) {
-			CProjectHelper.delete(fProject);
-		}
-	}
-
 	public void testFastIndexer() throws Exception {
 		CCorePlugin.getIndexManager().setIndexerId(fProject, IPDOMManager.ID_FAST_INDEXER);
 		IndexerPreferences.set(fProject.getProject(), IndexerPreferences.KEY_INDEX_UNUSED_HEADERS_WITH_DEFAULT_LANG,
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java
index c89160033c9..7f883a9d095 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java
@@ -45,7 +45,6 @@ public class IndexSearchTest extends IndexTestBase {
 
 	public static TestSuite suite() {
 		TestSuite suite = suite(IndexSearchTest.class, "_");
-		suite.addTest(new IndexSearchTest("deleteProject"));
 		return suite;
 	}
 
@@ -59,9 +58,8 @@ public class IndexSearchTest extends IndexTestBase {
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		if (fProject == null) {
-			fProject = createProject(true, "resources/indexTests/search");
-		}
+		fProject = createProject(true, "resources/indexTests/search");
+
 		fIndex = CCorePlugin.getIndexManager().getIndex(fProject);
 		fIndex.acquireReadLock();
 	}
@@ -75,7 +73,6 @@ public class IndexSearchTest extends IndexTestBase {
 		super.tearDown();
 	}
 
-
 	private void checkIsClass(IIndexBinding binding) {
 		assertTrue(binding instanceof ICPPClassType);
 	}
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexUpdateTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexUpdateTests.java
index 188ff789288..f003f954ff9 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexUpdateTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexUpdateTests.java
@@ -85,7 +85,6 @@ public class IndexUpdateTests extends IndexTestBase {
 
 	public static TestSuite suite() {
 		TestSuite suite = suite(IndexUpdateTests.class, "_");
-		suite.addTest(new IndexUpdateTests("deleteProject"));
 		return suite;
 	}
 
@@ -104,12 +103,8 @@ public class IndexUpdateTests extends IndexTestBase {
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		if (fCppProject == null) {
-			fCppProject = CProjectHelper.createCCProject("indexUpdateTestsCpp", null, IPDOMManager.ID_FAST_INDEXER);
-		}
-		if (fCProject == null) {
-			fCProject = CProjectHelper.createCProject("indexUpdateTestsC", null, IPDOMManager.ID_FAST_INDEXER);
-		}
+		fCppProject = CProjectHelper.createCCProject("indexUpdateTestsCpp", null, IPDOMManager.ID_FAST_INDEXER);
+		fCProject = CProjectHelper.createCProject("indexUpdateTestsC", null, IPDOMManager.ID_FAST_INDEXER);
 		waitForIndexer(fCppProject);
 		waitForIndexer(fCProject);
 		fIndex = CCorePlugin.getIndexManager().getIndex(new ICProject[] { fCProject, fCppProject });
@@ -164,18 +159,11 @@ public class IndexUpdateTests extends IndexTestBase {
 		if (fHeader != null) {
 			fHeader.delete(true, npm());
 		}
-		super.tearDown();
-	}
 
-	public void deleteProject() {
-		if (fCProject != null) {
-			CProjectHelper.delete(fCProject);
-			fCProject = null;
-		}
-		if (fCppProject != null) {
-			CProjectHelper.delete(fCppProject);
-			fCppProject = null;
-		}
+		CProjectHelper.delete(fCProject);
+		CProjectHelper.delete(fCppProject);
+
+		super.tearDown();
 	}
 
 	// int globalVar;