diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemTestCase.java
index 633af26d9a0..b25c2c73c6a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemTestCase.java
@@ -51,6 +51,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import static org.jetbrains.kotlin.test.testFramework.EdtTestUtil.runInEdtAndWait;
+
 // part of com.intellij.openapi.externalSystem.test.ExternalSystemTestCase
 public abstract class ExternalSystemTestCase extends UsefulTestCase {
   private File ourTempDir;
@@ -224,7 +226,7 @@ public abstract class ExternalSystemTestCase extends UsefulTestCase {
 
   @Override
   protected void invokeTestRunnable(@NotNull Runnable runnable) throws Exception {
-    runnable.run();
+    runInEdtAndWait(runnable);
   }
 
   protected static String getRoot() {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt
index d9faaa5bdf5..ce26b16466a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt
@@ -187,11 +187,4 @@ class GradleInspectionTest : GradleImportingTestCase() {
 
         return resultRef.get()
     }
-
-
-    override fun invokeTestRunnable(runnable: Runnable) {
-        runInEdtAndWait {
-            runnable.run()
-        }
-    }
 }
\ No newline at end of file