diff --git a/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java b/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java
index 25e840058e08..f037f7971cc7 100644
--- a/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java
+++ b/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java
@@ -17,7 +17,6 @@ package com.intellij.core;
 
 import com.intellij.mock.MockFileIndexFacade;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.roots.FileIndexFacade;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.openapi.roots.PackageIndex;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -45,7 +44,7 @@ public class JavaCoreProjectEnvironment  extends CoreProjectEnvironment {
     super(parentDisposable, applicationEnvironment);
 
     myProject.registerService(PsiElementFactory.class, new PsiElementFactoryImpl(myPsiManager));
-    myProject.registerService(JavaPsiImplementationHelper.class, new CoreJavaPsiImplementationHelper());
+    myProject.registerService(JavaPsiImplementationHelper.class, createJavaPsiImplementationHelper());
     myProject.registerService(PsiResolveHelper.class, new PsiResolveHelperImpl(myPsiManager));
     myProject.registerService(LanguageLevelProjectExtension.class, new CoreLanguageLevelProjectExtension());
     myProject.registerService(JavaResolveCache.class, new JavaResolveCache(myMessageBus));
@@ -64,6 +63,10 @@ public class JavaCoreProjectEnvironment  extends CoreProjectEnvironment {
     myProject.registerService(JavaPsiFacade.class, javaPsiFacade);
   }
 
+  protected CoreJavaPsiImplementationHelper createJavaPsiImplementationHelper() {
+    return new CoreJavaPsiImplementationHelper();
+  }
+
   protected JavaFileManager createCoreFileManager() {
     return new CoreJavaFileManager(myPsiManager);
   }