diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java
index 5ca8ed0..d1cf016 100644
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java
+++ b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java
@@ -55,8 +55,9 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.ITypeNameRequestor;
 import org.eclipse.jdt.core.search.SearchEngine;
+import org.eclipse.jdt.core.search.SearchPattern;
+import org.eclipse.jdt.core.search.TypeNameRequestor;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.osgi.framework.Bundle;
 public class TestProject {
@@ -172,12 +173,11 @@
 		return new Path(localJarURL.getPath());
 	}
 	private void waitForIndexer() throws JavaModelException {
-		new SearchEngine().searchAllTypeNames(ResourcesPlugin.getWorkspace(),
-				null, null, IJavaSearchConstants.EXACT_MATCH,
-				IJavaSearchConstants.CASE_SENSITIVE,
+		new SearchEngine().searchAllTypeNames(null, null, 
+				SearchPattern.R_CASE_SENSITIVE,
 				IJavaSearchConstants.CLASS, SearchEngine
 						.createJavaSearchScope(new IJavaElement[0]),
-				new ITypeNameRequestor() {
+				new TypeNameRequestor() {
 					public void acceptClass(char[] packageName,
 							char[] simpleTypeName, char[][] enclosingTypeNames,
 							String path) {