diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java
index 03cf15726566..ad2843466357 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java
@@ -605,6 +605,11 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj
   }
 
   private void doUpdateOnRefresh() {
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      if (!myStartupActivityPerformed) {
+        return; // in test mode suppress addition to a queue unless project is properly initialized
+      }
+    }
     myStartupManager.runWhenProjectIsInitialized(new DumbAwareRunnable() {
       public void run() {
         DumbServiceImpl.getInstance(myProject).queueCacheUpdate(myRefreshCacheUpdaters);