diff --git a/java/java-psi-impl/src/com/intellij/core/JavaCoreEnvironment.java b/java/java-psi-impl/src/com/intellij/core/JavaCoreEnvironment.java
index a6a0dcc9db22..5e3f0b50b5c9 100644
--- a/java/java-psi-impl/src/com/intellij/core/JavaCoreEnvironment.java
+++ b/java/java-psi-impl/src/com/intellij/core/JavaCoreEnvironment.java
@@ -26,6 +26,7 @@ import com.intellij.psi.impl.JavaPsiImplementationHelper;
 import com.intellij.psi.impl.PsiElementFactoryImpl;
 import com.intellij.psi.impl.compiled.ClassFileStubBuilder;
 import com.intellij.psi.impl.compiled.ClsStubBuilderFactory;
+import com.intellij.psi.impl.source.resolve.PsiResolveHelperImpl;
 import com.intellij.psi.stubs.BinaryFileStubBuilders;
 
 import java.io.File;
@@ -54,6 +55,7 @@ public class JavaCoreEnvironment extends CoreEnvironment {
     myProject.registerService(JavaPsiFacade.class, javaPsiFacade);
     myProject.registerService(PsiElementFactory.class, new PsiElementFactoryImpl(myPsiManager));
     myProject.registerService(JavaPsiImplementationHelper.class, new CoreJavaPsiImplementationHelper());
+    myProject.registerService(PsiResolveHelper.class, new PsiResolveHelperImpl(myPsiManager));
 
     myApplication.registerService(EmptySubstitutor.class, new EmptySubstitutorImpl());
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
similarity index 100%
rename from java/java-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
rename to java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java