diff --git a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java index 5ff4d4e7fcfb..a6221007427f 100644 --- a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java +++ b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java @@ -147,9 +147,12 @@ public class IdeEventQueue extends EventQueue { } private IdeEventQueue() { - EventQueue systemEventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue(); - assert !(systemEventQueue instanceof IdeEventQueue) : systemEventQueue; - systemEventQueue.push(this); + final Application application = ApplicationManager.getApplication(); + if (application == null || !application.isUnitTestMode()) { + EventQueue systemEventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue(); + assert !(systemEventQueue instanceof IdeEventQueue) : systemEventQueue; + systemEventQueue.push(this); + } addIdleTimeCounterRequest(); final KeyboardFocusManager keyboardFocusManager = KeyboardFocusManager.getCurrentKeyboardFocusManager();