diff --git a/platform/configuration-store-impl/testSrc/ProjectStoreTest.kt b/platform/configuration-store-impl/testSrc/ProjectStoreTest.kt
index 617a4988d788..80fa150c2b13 100644
--- a/platform/configuration-store-impl/testSrc/ProjectStoreTest.kt
+++ b/platform/configuration-store-impl/testSrc/ProjectStoreTest.kt
@@ -253,9 +253,7 @@ internal class ProjectStoreTest {
       assertThat(miscXml).contains("""<option name="AAvalue" value="foo" />""")
     }
     finally {
-      runInEdt {
-        PlatformTestUtil.forceCloseProjectWithoutSaving(newProject)
-      }
+      PlatformTestUtil.forceCloseProjectWithoutSaving(newProject)
     }
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/StartupManagerTest.kt b/platform/platform-tests/testSrc/com/intellij/ide/StartupManagerTest.kt
index 14e5a9dda58a..61c066f2e6af 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/StartupManagerTest.kt
+++ b/platform/platform-tests/testSrc/com/intellij/ide/StartupManagerTest.kt
@@ -54,9 +54,7 @@ class StartupManagerTest {
       done.await(1, TimeUnit.SECONDS)
     }
     finally {
-      runInEdtAndWait {
-        PlatformTestUtil.forceCloseProjectWithoutSaving(project)
-      }
+      PlatformTestUtil.forceCloseProjectWithoutSaving(project)
     }
   }
 }
\ No newline at end of file
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/ProjectOpeningTest.kt b/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/ProjectOpeningTest.kt
index 31bfc92b84de..4301e82dea86 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/ProjectOpeningTest.kt
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/ProjectOpeningTest.kt
@@ -48,9 +48,7 @@ class ProjectOpeningTest {
       override fun run(indicator: ProgressIndicator) {
         val project = ProjectManagerEx.getInstanceEx().openProject(foo, createTestOpenProjectOptions())
         if (project != null) {
-          runInEdtAndWait {
-            PlatformTestUtil.forceCloseProjectWithoutSaving(project)
-          }
+          PlatformTestUtil.forceCloseProjectWithoutSaving(project)
         }
         assertThat(project).isNull()
       }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
index bcc100ff26fb..cb7f927b7383 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
@@ -316,7 +316,7 @@ public class VfsUtilTest extends BareTestFixtureTestCase {
         finally {
           // this concoction is to ensure close() is called on the mock ProjectManagerImpl
           assertTrue(project.get().isOpen());
-          ApplicationManager.getApplication().invokeAndWait(() -> PlatformTestUtil.forceCloseProjectWithoutSaving(project.get()));
+          PlatformTestUtil.forceCloseProjectWithoutSaving(project.get());
         }
       }
     );
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 859eae0bcf1a..66429262c610 100644
--- a/tools/index-tools/src/org/jetbrains/index/stubs/SdkUtils.kt
+++ b/tools/index-tools/src/org/jetbrains/index/stubs/SdkUtils.kt
@@ -11,7 +11,6 @@ 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
 import java.nio.file.Paths
 
@@ -37,9 +36,7 @@ fun openProjectWithSdk(projectPath: String,
     return Pair(project, sdk)
   }
   catch (e: Throwable) {
-    UIUtil.invokeAndWaitIfNeeded(Runnable {
-      PlatformTestUtil.forceCloseProjectWithoutSaving(project)
-    })
+    PlatformTestUtil.forceCloseProjectWithoutSaving(project)
     throw e
   }
 }