diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index f9a7655bbeba..ae9b716b8997 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -172,10 +172,6 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App
 
     myDoNotSave = isUnitTestMode || isHeadless;
 
-    if (myTestModeFlag) {
-      registerShutdownHook();
-    }
-
     if (!isUnitTestMode && !isHeadless) {
       Disposer.register(this, Disposer.newDisposable(), "ui");
 
@@ -222,26 +218,6 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App
     myLock = new ReadMostlyRWLock(edt);
   }
 
-  private void registerShutdownHook() {
-    ShutDownTracker.getInstance().registerShutdownTask(() -> {
-      if (isDisposed() || myDisposeInProgress) {
-        return;
-      }
-      ShutDownTracker.invokeAndWait(isUnitTestMode(), true, () -> {
-        if (ApplicationManager.getApplication() != this) return;
-        try {
-          myDisposeInProgress = true;
-          saveAll();
-        }
-        finally {
-          if (!disposeSelf(true)) {
-            myDisposeInProgress = false;
-          }
-        }
-      });
-    });
-  }
-
   private boolean disposeSelf(final boolean checkCanCloseProject) {
     final ProjectManagerImpl manager = (ProjectManagerImpl)ProjectManagerEx.getInstanceEx();
     if (manager != null) {