diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
index 9b39245a44a6..b59ca990f9bd 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
@@ -318,7 +318,12 @@ public class FileBasedIndex implements ApplicationComponent {
       ShutDownTracker.getInstance().registerShutdownTask(new Runnable() {
         @Override
         public void run() {
-          performShutdown();
+          ShutDownTracker.invokeAndWait(ApplicationManager.getApplication().isUnitTestMode(), new Runnable() {
+            @Override
+            public void run() {
+              performShutdown();
+            }
+          });
         }
       });
       //FileUtil.createIfDoesntExist(workInProgressFile);