diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMRunnerUtil.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMRunnerUtil.java
index 1d04ae666beb..acd9b7ca5e3a 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMRunnerUtil.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMRunnerUtil.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -39,11 +40,10 @@ public class SMRunnerUtil {
    */
   public static void addToInvokeLater(final Runnable runnable) {
     final Application application = ApplicationManager.getApplication();
-    if (application.isHeadlessEnvironment() || application.isUnitTestMode()
-        || SwingUtilities.isEventDispatchThread()) {
+    if (application.isHeadlessEnvironment() && !application.isUnitTestMode()) {
       runnable.run();
     } else {
-      SwingUtilities.invokeLater(runnable);
+      UIUtil.invokeLaterIfNeeded(runnable);
     }
   }