diff --git a/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
index d4dcdbfc3bcf..f7fc765f9925 100644
--- a/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
@@ -16,6 +16,9 @@
 
 package com.intellij.psi.impl.file.impl;
 
+import com.intellij.ide.startup.StartupManagerEx;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.startup.StartupManager;
 import com.intellij.psi.impl.PsiManagerEx;
@@ -26,19 +29,13 @@ import com.intellij.util.messages.MessageBus;
  */
 public class JavaFileManagerImpl extends JavaFileManagerBase {
 
-
   public JavaFileManagerImpl(final PsiManagerEx manager, final ProjectRootManager projectRootManager, MessageBus bus,
                              final StartupManager startupManager) {
     super(manager, projectRootManager, bus);
 
-    startupManager.registerStartupActivity(
-      new Runnable() {
-        @Override
-        public void run() {
-          initialize();
-        }
-      }
-    );
-
+    if (!((StartupManagerEx)startupManager).startupActivityPassed() && !ApplicationManager.getApplication().isUnitTestMode()) {
+      Logger.getInstance("#com.intellij.psi.impl.file.impl.JavaFileManagerImpl")
+        .error("Access to psi files should be performed only after startup activity");
+    }
   }
 }
diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerBase.java b/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerBase.java
index 7e40177379fb..b41b36311a2a 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerBase.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerBase.java
@@ -49,7 +49,6 @@ public abstract class JavaFileManagerBase implements JavaFileManager, Disposable
   private final PsiManagerEx myManager;
   private final ProjectRootManager myProjectRootManager;
   private volatile Set<String> myNontrivialPackagePrefixes = null;
-  private boolean myInitialized = false;
   private boolean myDisposed = false;
   private final PackageIndex myPackageIndex;
   protected final MessageBusConnection myConnection;
@@ -76,11 +75,6 @@ public abstract class JavaFileManagerBase implements JavaFileManager, Disposable
     });
   }
 
-  @Override
-  public void initialize() {
-    myInitialized = true;
-  }
-
   @Override
   public void dispose() {
     myDisposed = true;
@@ -136,10 +130,6 @@ public abstract class JavaFileManagerBase implements JavaFileManager, Disposable
   @Override
   @Nullable
   public PsiClass findClass(@NotNull String qName, @NotNull GlobalSearchScope scope) {
-    if (!myInitialized) {
-      LOG.error("Access to psi files should be performed only after startup activity");
-      return null;
-    }
     LOG.assertTrue(!myDisposed);
 
     if (CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) { // optimization
diff --git a/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java b/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
index f769a60876ca..a012988edf08 100644
--- a/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
+++ b/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
@@ -198,10 +198,6 @@ public class CoreJavaFileManager implements JavaFileManager {
     return Collections.emptyList();
   }
 
-  @Override
-  public void initialize() {
-  }
-
   public void addToClasspath(VirtualFile root) {
     myClasspath.add(root);
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java b/java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java
index 059fa741960c..fc883fe34b56 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/file/impl/JavaFileManager.java
@@ -38,5 +38,4 @@ public interface JavaFileManager {
 
   Collection<String> getNonTrivialPackagePrefixes();
 
-  void initialize();
 }
\ No newline at end of file
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 1b3c86b5801d..140afbae2ad6 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -29,12 +29,6 @@
       <loadForDefaultProject/>
     </component>
 
-    <component>
-      <interface-class>com.intellij.psi.impl.file.impl.JavaFileManager</interface-class>
-      <implementation-class>com.intellij.psi.impl.file.impl.JavaFileManagerImpl</implementation-class>
-      <loadForDefaultProject/>
-    </component>
-
     <component>
       <implementation-class>com.intellij.codeInsight.daemon.impl.PostHighlightingPassFactory</implementation-class>
     </component>
@@ -370,6 +364,8 @@
                     serviceImplementation="com.intellij.ide.util.TreeClassChooserFactoryImpl"/>
     <projectService serviceInterface="com.intellij.psi.JavaPsiFacade"
                     serviceImplementation="com.intellij.psi.impl.JavaPsiFacadeImpl"/>
+    <projectService serviceInterface="com.intellij.psi.impl.file.impl.JavaFileManager"
+                    serviceImplementation="com.intellij.psi.impl.file.impl.JavaFileManagerImpl"/>
     <projectService serviceInterface="com.intellij.codeInsight.guess.GuessManager"
                     serviceImplementation="com.intellij.codeInsight.guess.impl.GuessManagerImpl"/>
     <projectService serviceInterface="com.intellij.psi.impl.source.resolve.JavaResolveCache"