diff --git a/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java b/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java
index d02a7c95809a..db7ea4375051 100644
--- a/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java
+++ b/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java
@@ -13,7 +13,6 @@ import com.intellij.openapi.diagnostic.DefaultLogger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ex.ProjectManagerEx;
 import com.intellij.openapi.projectRoots.ProjectJdkTable;
 import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl;
 import com.intellij.openapi.roots.ProjectRootManager;
@@ -25,6 +24,7 @@ import com.intellij.psi.search.FilenameIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.testFramework.CompilerTester;
 import com.intellij.testFramework.PlatformTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.testFramework.TestDataProvider;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
@@ -105,7 +105,7 @@ public abstract class AbstractApplyAndRevertTestCase extends PlatformTestCase {
         myCompilerTester.tearDown();
       }
       PathMacros.getInstance().setMacro(PathMacrosImpl.MAVEN_REPOSITORY, oldMacroValue);
-      ProjectManagerEx.getInstanceEx().forceCloseProject(myProject, true);
+      PlatformTestUtil.forceCloseProjectWithoutSaving(myProject);
       myProject = null;
       InspectionProfileImpl.INIT_INSPECTIONS = false;
     }
diff --git a/java/java-tests/testSrc/com/intellij/roots/ModuleLoadingStressTest.java b/java/java-tests/testSrc/com/intellij/roots/ModuleLoadingStressTest.java
index 3ea29f501485..2aa31c8a9890 100644
--- a/java/java-tests/testSrc/com/intellij/roots/ModuleLoadingStressTest.java
+++ b/java/java-tests/testSrc/com/intellij/roots/ModuleLoadingStressTest.java
@@ -6,12 +6,12 @@ import com.intellij.openapi.module.JavaModuleType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.ProjectManager;
-import com.intellij.openapi.project.ex.ProjectManagerEx;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.PlatformTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
 import kotlin.Unit;
 
 import java.io.File;
@@ -38,7 +38,7 @@ public class ModuleLoadingStressTest extends PlatformTestCase {
 
     String projectFilePath = myProject.getProjectFilePath();
     String moduleName = myModule.getName();
-    ProjectManagerEx.getInstanceEx().forceCloseProject(myProject, true);
+    PlatformTestUtil.forceCloseProjectWithoutSaving(myProject);
 
     myProject = ProjectManager.getInstance().loadAndOpenProject(projectFilePath);
     Module[] modules = ModuleManager.getInstance(myProject).getModules();
diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
index 50857c2d25cf..69630469d722 100644
--- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
+++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
@@ -12,7 +12,6 @@ import com.intellij.openapi.application.impl.LaterInvocator;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
-import com.intellij.openapi.project.ex.ProjectManagerEx;
 import com.intellij.openapi.projectRoots.ProjectJdkTable;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkTypeId;
@@ -29,6 +28,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.projectImport.ProjectImportProvider;
 import com.intellij.testFramework.PlatformTestCase;
+import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.util.Consumer;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.containers.ContainerUtil;
@@ -74,7 +74,7 @@ public abstract class ProjectWizardTestCase<T extends AbstractProjectWizard> ext
         myWizard = null;
       }
       if (myCreatedProject != null) {
-        ProjectManagerEx.getInstanceEx().forceCloseProject(myCreatedProject, true);
+        PlatformTestUtil.forceCloseProjectWithoutSaving(myCreatedProject);
         myCreatedProject = null;
       }
       ApplicationManager.getApplication().runWriteAction(() -> {
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java
index 7b8c666460dc..4ffe2a33fd83 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java
@@ -8,7 +8,6 @@ import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
-import com.intellij.openapi.project.ex.ProjectManagerEx;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.io.FileUtilRt;
 import com.intellij.testFramework.LightPlatformTestCase;
@@ -178,7 +177,7 @@ public class LightFileTemplatesTest extends LightPlatformTestCase {
 
   private static void closeProject(final Project project) {
     if (project != null && !project.isDisposed()) {
-      ProjectManagerEx.getInstanceEx().forceCloseProject(project, true);
+      PlatformTestUtil.forceCloseProjectWithoutSaving(project);
     }
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/ProjectOpeningTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/ProjectOpeningTest.java
index da0d959e4de0..4a0923f022c9 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/ProjectOpeningTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/ProjectOpeningTest.java
@@ -10,7 +10,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.project.ex.ProjectManagerEx;
 import com.intellij.openapi.startup.StartupActivity;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.testFramework.PlatformTestCase;
 import com.intellij.testFramework.PlatformTestUtil;
 import org.jetbrains.annotations.NotNull;
@@ -100,8 +99,7 @@ public class ProjectOpeningTest extends PlatformTestCase {
 
   static void closeProject(@Nullable Project project) {
     if (project != null && !project.isDisposed()) {
-      ProjectManagerEx.getInstanceEx().forceCloseProject(project, false);
-      ApplicationManager.getApplication().runWriteAction(() -> Disposer.dispose(project));
+      PlatformTestUtil.forceCloseProjectWithoutSaving(project);
     }
   }
 
diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
index e74343435bcd..544ad59e00f2 100644
--- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
+++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
@@ -594,6 +594,12 @@ public class PlatformTestUtil {
     }
   }
 
+  public static void forceCloseProjectWithoutSaving(@NotNull Project project) {
+    ProjectManagerEx.getInstanceEx().forceCloseProject(project, false /* do not dispose */);
+    // explicitly dispose because `dispose` option for forceCloseProject doesn't work todo why?
+    getApplication().runWriteAction(() -> Disposer.dispose(project));
+  }
+
   public static void saveProject(@NotNull Project project) {
     saveProject(project, false);
   }
diff --git a/plugins/gradle/java/testSources/importing/GradleProjectOpenProcessorTest.java b/plugins/gradle/java/testSources/importing/GradleProjectOpenProcessorTest.java
index 2a4f2063b447..ae3cd5ca3d57 100644
--- a/plugins/gradle/java/testSources/importing/GradleProjectOpenProcessorTest.java
+++ b/plugins/gradle/java/testSources/importing/GradleProjectOpenProcessorTest.java
@@ -12,13 +12,11 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.project.ProjectManagerListener;
-import com.intellij.openapi.project.ex.ProjectManagerEx;
 import com.intellij.openapi.project.impl.ProjectLifecycleListener;
 import com.intellij.openapi.projectRoots.JavaSdk;
 import com.intellij.openapi.projectRoots.ProjectJdkTable;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.profile.codeInspection.InspectionProfileManager;
@@ -254,8 +252,7 @@ public class GradleProjectOpenProcessorTest extends GradleImportingTestCase {
 
   private static void closeProject(final Project project) {
     if (project != null && !project.isDisposed()) {
-      ProjectManagerEx.getInstanceEx().forceCloseProject(project, false);
-      ApplicationManager.getApplication().runWriteAction(() -> Disposer.dispose(project));
+      PlatformTestUtil.forceCloseProjectWithoutSaving(project);
     }
   }
 }
\ No newline at end of file
diff --git a/tools/index-tools/src/org/jetbrains/index/stubs/SdkUtils.kt b/tools/index-tools/src/org/jetbrains/index/stubs/SdkUtils.kt
index fd9817fb90e2..d20b9d790938 100644
--- a/tools/index-tools/src/org/jetbrains/index/stubs/SdkUtils.kt
+++ b/tools/index-tools/src/org/jetbrains/index/stubs/SdkUtils.kt
@@ -6,12 +6,12 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
-import com.intellij.openapi.project.ex.ProjectManagerEx
 import com.intellij.openapi.projectRoots.Sdk
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.roots.ModuleRootModificationUtil
 import com.intellij.openapi.util.Computable
 import com.intellij.openapi.vfs.VfsUtil
+import com.intellij.testFramework.PlatformTestUtil
 import com.intellij.util.ui.UIUtil
 import java.io.File
 
@@ -44,7 +44,7 @@ fun openProjectWithSdk(projectPath: String,
   catch (e: Throwable) {
     if (project != null) {
       UIUtil.invokeAndWaitIfNeeded(Runnable {
-        ProjectManagerEx.getInstanceEx().forceCloseProject(project, true)
+        PlatformTestUtil.forceCloseProjectWithoutSaving(project)
       })
     }
     throw e