diff --git a/python/testSrc/com/jetbrains/env/PyTestTask.java b/python/testSrc/com/jetbrains/env/PyTestTask.java
index 6a2956aacf84..3869aeba930c 100644
--- a/python/testSrc/com/jetbrains/env/PyTestTask.java
+++ b/python/testSrc/com/jetbrains/env/PyTestTask.java
@@ -1,7 +1,6 @@
 package com.jetbrains.env;
 
 import com.google.common.collect.Sets;
-import com.intellij.ide.IdeEventQueue;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.testFramework.LeakHunter;
 import com.jetbrains.python.psi.LanguageLevel;
@@ -18,7 +17,6 @@ public abstract class PyTestTask {
   private String myScriptParameters;
 
 
-
   public void setScriptName(String scriptName) {
     myScriptName = scriptName;
   }
@@ -35,7 +33,6 @@ public abstract class PyTestTask {
    * Each inheritor may do anything on edt, but should call parent *after all* on main thread
    */
   public void tearDown() throws Exception {
-    IdeEventQueue.getInstance().flushQueue();
     LeakHunter.checkNonDefaultProjectLeak();
     LeakHunter.checkProjectLeak();
   }
@@ -44,7 +41,7 @@ public abstract class PyTestTask {
    * Run test on certain SDK path.
    * To create SDK from path, use {@link PyExecutionFixtureTestTask#createTempSdk(String, sdkTools.SdkCreationType)}
    *
-   * @param sdkHome sdk path
+   * @param sdkHome     sdk path
    * @param existingSdk If sdk exists already you are encouraged to reuse it. Create one using sdkHome otherwise.
    */
   public abstract void runTestOn(@NotNull String sdkHome, @Nullable Sdk existingSdk) throws Exception;
@@ -72,7 +69,6 @@ public abstract class PyTestTask {
   }
 
 
-
   public String getScriptParameters() {
     return myScriptParameters;
   }
@@ -88,6 +84,7 @@ public abstract class PyTestTask {
 
   /**
    * Checks if task supports this language level
+   *
    * @param level level to check
    * @return true if supports
    */
diff --git a/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java b/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java
index 36faa10d49cc..a3b758d6be81 100644
--- a/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java
+++ b/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java
@@ -230,6 +230,7 @@ public abstract class PyUnitTestTask extends PyExecutionFixtureTestTask {
               });
               myConsoleView = (SMTRunnerConsoleView)descriptor.getExecutionConsole();
               myTestProxy = myConsoleView.getResultsViewer().getTestsRootNode();
+              Disposer.register(myFixture.getProject(), myTestProxy);
               myConsoleView.getResultsViewer().addEventsListener(new TestResultsViewer.SMEventsAdapter() {
                 @Override
                 public void onTestingFinished(TestResultsViewer sender) {