diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsFastIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsFastIndexer.java
deleted file mode 100644
index 29fe667736d..00000000000
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsFastIndexer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Markus Schorn - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.cdt.ui.tests.text.selection;
-
-import junit.framework.Test;
-
-import org.eclipse.cdt.core.dom.IPDOMManager;
-
-public class CPPSelectionTestsFastIndexer extends CPPSelectionTestsAnyIndexer {
-	public CPPSelectionTestsFastIndexer(String name) {
-		super(name, IPDOMManager.ID_FAST_INDEXER);
-	}
-	
-	public static Test suite() {
-		return suite(CPPSelectionTestsFastIndexer.class);
-	}
-}
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java
similarity index 99%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java
index 5a0f62a47d6..a8a54f244fb 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsIndexer.java
@@ -13,6 +13,8 @@ package org.eclipse.cdt.ui.tests.text.selection;
 
 import java.io.IOException;
 
+import junit.framework.Test;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.ui.IEditorInput;
@@ -36,13 +38,17 @@ import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 /**
  * Test Ctrl-F3/F3 with the DOM Indexer for a C++ project.
  */
-public abstract class CPPSelectionTestsAnyIndexer extends BaseSelectionTestsIndexer {
+public class CPPSelectionTestsIndexer extends BaseSelectionTestsIndexer {
 	protected String sourceIndexerID;
 	protected IIndex index;
 	
-	public CPPSelectionTestsAnyIndexer(String name, String indexerID) {
+	public CPPSelectionTestsIndexer(String name) {
 		super(name);
-		sourceIndexerID= indexerID;
+		sourceIndexerID= IPDOMManager.ID_FAST_INDEXER;
+	}
+	
+	public static Test suite() {
+		return suite(CPPSelectionTestsIndexer.class);
 	}
 	
 	@Override
@@ -74,7 +80,7 @@ public abstract class CPPSelectionTestsAnyIndexer extends BaseSelectionTestsInde
 	
 	protected StringBuilder[] getContents(int sections) throws IOException {
 		return TestSourceReader.getContentsForTest(
-				CTestPlugin.getDefault().getBundle(), "ui", CPPSelectionTestsAnyIndexer.class, getName(), sections);
+				CTestPlugin.getDefault().getBundle(), "ui", CPPSelectionTestsIndexer.class, getName(), sections);
 	}
 
 	private void assertNode(String name, int offset, IASTNode node) {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsFastIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsFastIndexer.java
deleted file mode 100644
index 0a8734a8d90..00000000000
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsFastIndexer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Markus Schorn - initial API and implementation
- *******************************************************************************/ 
-
-package org.eclipse.cdt.ui.tests.text.selection;
-
-import junit.framework.Test;
-
-import org.eclipse.cdt.core.dom.IPDOMManager;
-
-public class CSelectionTestsFastIndexer extends CSelectionTestsAnyIndexer {
-	public CSelectionTestsFastIndexer(String name) {
-		super(name, IPDOMManager.ID_FAST_INDEXER);
-	}
-	
-	public static Test suite() {
-		return suite(CSelectionTestsFastIndexer.class);
-	}
-}
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsAnyIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java
similarity index 98%
rename from core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsAnyIndexer.java
rename to core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java
index fcad138f1a7..e58d560c877 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsAnyIndexer.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsIndexer.java
@@ -12,6 +12,8 @@ package org.eclipse.cdt.ui.tests.text.selection;
 
 import java.io.IOException;
 
+import junit.framework.Test;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.ui.IEditorInput;
@@ -32,13 +34,17 @@ import org.eclipse.cdt.ui.testplugin.CTestPlugin;
 
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 
-public abstract class CSelectionTestsAnyIndexer extends BaseSelectionTestsIndexer {
+public class CSelectionTestsIndexer extends BaseSelectionTestsIndexer {
 	private String sourceIndexerID;
 	private IIndex index;
 
-	public CSelectionTestsAnyIndexer(String name, String indexerID) {
+	public CSelectionTestsIndexer(String name) {
 		super(name);
-		sourceIndexerID= indexerID;
+		sourceIndexerID= IPDOMManager.ID_FAST_INDEXER;
+	}
+	
+	public static Test suite() {
+		return suite(CSelectionTestsIndexer.class);
 	}
 	
 	@Override
@@ -67,7 +73,7 @@ public abstract class CSelectionTestsAnyIndexer extends BaseSelectionTestsIndexe
 	
 	protected StringBuilder[] getContents(int sections) throws IOException {
 		return TestSourceReader.getContentsForTest(
-				CTestPlugin.getDefault().getBundle(), "ui", CSelectionTestsAnyIndexer.class, getName(), sections);
+				CTestPlugin.getDefault().getBundle(), "ui", CSelectionTestsIndexer.class, getName(), sections);
 	}
 
 	private void assertNode(String name, int offset, IASTNode node) {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java
index ac172470213..43fd6454f98 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/SelectionTestSuite.java
@@ -26,7 +26,7 @@ public class SelectionTestSuite extends TestSuite {
         addTest(ResolveBindingTests.suite());
         addTest(CPPSelectionTestsNoIndexer.suite());
 		addTest(CSelectionTestsNoIndexer.suite());
-		addTest(CPPSelectionTestsFastIndexer.suite());
-		addTest(CSelectionTestsFastIndexer.suite());
+		addTest(CPPSelectionTestsIndexer.suite());
+		addTest(CSelectionTestsIndexer.suite());
     }
 }