diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
index 1f11c3bd7f8..6e9c9dff4a1 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.cdt.core.tests; singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: cdtcoretests.jar
 Bundle-Activator: org.eclipse.cdt.core.testplugin.CTestPlugin
-Bundle-Localization: plugin
 Export-Package: org.eclipse.cdt.core.cdescriptor.tests,
  org.eclipse.cdt.core.internal.errorparsers.tests,
  org.eclipse.cdt.core.model.failedTests,
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTests.java
index d251291b662..84428bd6a6f 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/AllLanguageTests.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.language;
 
-import org.eclipse.cdt.internal.index.tests.IndexTests;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -20,7 +19,7 @@ import junit.framework.TestSuite;
  */
 public class AllLanguageTests extends TestSuite {
 	public static Test suite() {
-		TestSuite suite = new IndexTests();
+		TestSuite suite = new AllLanguageTests();
 		
 		suite.addTest(LanguageInheritanceTests.suite());
 		
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java
index 2c5c99efbdc..7f2f1a0e2e7 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java
@@ -13,7 +13,6 @@ package org.eclipse.cdt.core.language;
 import java.util.Collections;
 
 import junit.framework.Test;
-import junit.framework.TestCase;
 
 import org.eclipse.cdt.core.dom.IPDOMManager;
 import org.eclipse.cdt.core.dom.ast.gnu.c.GCCLanguage;
@@ -24,7 +23,6 @@ import org.eclipse.cdt.core.model.LanguageManager;
 import org.eclipse.cdt.core.testplugin.CProjectHelper;
 import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
 import org.eclipse.cdt.internal.core.CContentTypes;
-import org.eclipse.cdt.internal.index.tests.IndexCompositeTests;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.content.IContentType;
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
index a45ac6a5dcc..bab311e9d34 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
@@ -92,6 +92,11 @@ public class BaseUITestCase extends BaseTestCase {
 		long endTime= System.currentTimeMillis()+time;
 		do {
 			while (Display.getCurrent().readAndDispatch());
+			try {
+				Thread.sleep(20);
+			} catch (InterruptedException e) {
+				return;
+			}
 		}
 		while(System.currentTimeMillis() < endTime);
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java
index 1dfa35dc00d..886c6ca5979 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java
@@ -288,6 +288,14 @@ public class CallHierarchyAcrossProjectsTest extends CallHierarchyBaseTest {
 		TreeItem item1= checkTreeNode(item, 1, "MyClass::method1()");
 		checkTreeNode(item, 2, null); item= null;
 		
+		try {
+			tv.setExpandedState(item0.getData(), true); 
+			nextItem= checkTreeNode(item0, 0,  "MyClass::method2()");
+		}
+		catch (Throwable e) {
+			TreeItem tmp= item0; item0= item1; item1= tmp;
+		}
+
 		// method 1
 		tv.setExpandedState(item0.getData(), true); 
 		nextItem= checkTreeNode(item0, 0,  "MyClass::method2()");
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java
index 3cdf6f1c1d4..836db013204 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java
@@ -37,6 +37,7 @@ import org.eclipse.cdt.internal.ui.editor.CEditor;
 
 public class CallHierarchyBaseTest extends BaseUITestCase {
 	protected static final int INDEXER_WAIT_TIME = 8000;
+	private static int sProjectCounter= 0;
 
 	protected ICProject fCProject;
 	protected IIndex fIndex;
@@ -47,8 +48,8 @@ public class CallHierarchyBaseTest extends BaseUITestCase {
 
 	protected void setUp() throws Exception {
 		super.setUp();
-		fCProject= CProjectHelper.createCCProject("__chTest__", "bin", IPDOMManager.ID_NO_INDEXER);
-		CCorePlugin.getIndexManager().setIndexerId(fCProject, IPDOMManager.ID_FAST_INDEXER);
+		String prjName= "chTest"+sProjectCounter++;
+		fCProject= CProjectHelper.createCCProject(prjName, "bin", IPDOMManager.ID_FAST_INDEXER);
 		CCorePlugin.getIndexManager().joinIndexer(INDEXER_WAIT_TIME, NPM);
 		fIndex= CCorePlugin.getIndexManager().getIndex(fCProject);
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CppCallHierarchyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CppCallHierarchyTest.java
index c0ac66a7b0d..846c5dd6eff 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CppCallHierarchyTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CppCallHierarchyTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -263,6 +263,14 @@ public class CppCallHierarchyTest extends CallHierarchyBaseTest {
 		checkTreeNode(item, 2, null); item= null;
 		
 		// method 1
+		try {
+			tv.setExpandedState(item0.getData(), true); 
+			nextItem= checkTreeNode(item0, 0,  "MyClass::method2()");
+		}
+		catch (Throwable e) {
+			TreeItem tmp= item0; item0= item1; item1= tmp;
+		}
+		
 		tv.setExpandedState(item0.getData(), true); 
 		nextItem= checkTreeNode(item0, 0,  "MyClass::method2()");
 		checkTreeNode(item0, 1, null); item0= nextItem;
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java
index c6d9b4cdb90..dfddab6d731 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java
@@ -55,8 +55,7 @@ public class TypeHierarchyBaseTest extends BaseUITestCase {
 	protected void setUp() throws Exception {
 		super.setUp();
 		fCProject= CProjectHelper.createCCProject("__thTest__", "bin", IPDOMManager.ID_FAST_INDEXER);
-		CCorePlugin.getIndexManager().reindex(fCProject);
-
+		CCorePlugin.getIndexManager().joinIndexer(INDEXER_WAIT_TIME, NPM);
 		fIndex= CCorePlugin.getIndexManager().getIndex(fCProject);
 	}