diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexBindingResolutionBugs.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionBugs.java
similarity index 98%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexBindingResolutionBugs.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionBugs.java
index fed79ded68a..06552dc76e5 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexBindingResolutionBugs.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionBugs.java
@@ -9,7 +9,7 @@
  *    Markus Schorn - initial API and implementation
  *    Andrew Ferguson (Symbian)
  *******************************************************************************/
-package org.eclipse.cdt.internal.pdom.tests;
+package org.eclipse.cdt.internal.index.tests;
 
 import junit.framework.TestSuite;
 
@@ -127,5 +127,4 @@ public class IndexBindingResolutionBugs extends IndexBindingResolutionTestBase {
 		getBindingFromASTName("k=2", 1);
 		getBindingFromASTName("l=2", 1);
 	}
-
 }
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexBindingResolutionTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java
similarity index 98%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexBindingResolutionTestBase.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java
index 59507ee9400..3dab510aa7a 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexBindingResolutionTestBase.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java
@@ -9,7 +9,7 @@
  * Andrew Ferguson (Symbian) - Initial implementation
  * IBM Corporation
  *******************************************************************************/
-package org.eclipse.cdt.internal.pdom.tests;
+package org.eclipse.cdt.internal.index.tests;
 
 import java.io.IOException;
 
@@ -32,6 +32,7 @@ import org.eclipse.cdt.core.model.ILanguage;
 import org.eclipse.cdt.core.model.LanguageManager;
 import org.eclipse.cdt.core.testplugin.CProjectHelper;
 import org.eclipse.cdt.core.testplugin.CTestPlugin;
+import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
 import org.eclipse.cdt.core.testplugin.util.TestSourceReader;
 import org.eclipse.cdt.internal.core.CCoreInternals;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor;
@@ -53,7 +54,7 @@ import org.osgi.framework.Bundle;
  * This class is for testing the process by which bindings are looked up in
  * the PDOM purely from AST information (i.e. without a real binding from the DOM)
  */
-public abstract class IndexBindingResolutionTestBase extends PDOMTestBase {
+public abstract class IndexBindingResolutionTestBase extends BaseTestCase {
 	private ITestStrategy strategy;
 	
 	public void setStrategy(ITestStrategy strategy) {
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexCBindingResolutionBugs.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java
similarity index 97%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexCBindingResolutionBugs.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java
index f05c4f57bf1..bf67f6f0cd1 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexCBindingResolutionBugs.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionBugs.java
@@ -9,7 +9,7 @@
  *    Markus Schorn - initial API and implementation
  *    Andrew Ferguson (Symbian)
  *******************************************************************************/
-package org.eclipse.cdt.internal.pdom.tests;
+package org.eclipse.cdt.internal.index.tests;
 
 import junit.framework.TestSuite;
 
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexCBindingResolutionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionTest.java
similarity index 99%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexCBindingResolutionTest.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionTest.java
index 8b8c358210c..3453b3691af 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexCBindingResolutionTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCBindingResolutionTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Andrew Ferguson (Symbian) - Initial implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.pdom.tests;
+package org.eclipse.cdt.internal.index.tests;
 
 import java.io.IOException;
 
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexCPPBindingResolutionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java
similarity index 99%
rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexCPPBindingResolutionTest.java
rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java
index 84a05c8f7af..f14cbeb74a2 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IndexCPPBindingResolutionTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Andrew Ferguson (Symbian) - Initial implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.pdom.tests;
+package org.eclipse.cdt.internal.index.tests;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java
index cb9086e6eb5..c97ed8aa9a0 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTests.java
@@ -20,6 +20,7 @@ public class IndexTests extends TestSuite {
 
 	public static Test suite() {
 		TestSuite suite = new IndexTests();
+		
 		suite.addTest(IndexCompositeTests.suite());
 		suite.addTest(IndexListenerTest.suite());
 		suite.addTest(IndexLocationTest.suite());
@@ -28,6 +29,12 @@ public class IndexTests extends TestSuite {
 		suite.addTest(IndexBugsTests.suite());
 		suite.addTest(EnclosingNamesTest.suite());
 		suite.addTest(TeamSharedIndexTest.suite());
+		
+		IndexCBindingResolutionTest.addTests(suite);
+		IndexCPPBindingResolutionTest.addTests(suite);
+		IndexCBindingResolutionBugs.addTests(suite);
+		IndexBindingResolutionBugs.addTests(suite);
+		
 		return suite;
 	}
 	
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java
index 776efe272cb..dd74e899901 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTests.java
@@ -43,11 +43,6 @@ public class PDOMTests extends TestSuite {
 		suite.addTest(CPPVariableTests.suite());
 		suite.addTest(MethodTests.suite());
 		suite.addTest(NamespaceTests.suite());
-
-		IndexCBindingResolutionTest.addTests(suite);
-		IndexCPPBindingResolutionTest.addTests(suite);
-		IndexCBindingResolutionBugs.addTests(suite);
-		IndexBindingResolutionBugs.addTests(suite);
 		
 		suite.addTest(CFunctionTests.suite());
 		suite.addTest(CVariableTests.suite());