diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
index 946f645ea837..8337e7219d03 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
@@ -1331,4 +1331,20 @@ class Foo {
     myFixture.checkResult('class <caret>')
   }
 
+  void joinCompletion() {
+    myTester.joinCompletion()
+  }
+
+  protected def joinCommit(Closure c1={}) {
+    myTester.joinCommit(c1)
+  }
+
+  protected void joinAutopopup() {
+    myTester.joinAutopopup()
+  }
+
+  protected def joinAlarm() {
+    myTester.joinAlarm()
+  }
+
 }
diff --git a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy b/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy
index 503f221bc6a7..9a05e8d3633c 100644
--- a/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy
+++ b/java/testFramework/src/com/intellij/codeInsight/completion/CompletionAutoPopupTestCase.groovy
@@ -23,57 +23,23 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
  * @author peter
  */
 abstract class CompletionAutoPopupTestCase extends LightCodeInsightFixtureTestCase {
-  private CompletionAutoPopupTester myTester
+  protected CompletionAutoPopupTester myTester
 
   @Override protected void setUp() {
-    edt { superSetUp() }
-    myTester = new CompletionAutoPopupTester(myFixture)
-  }
-  void superSetUp() {
     super.setUp()
-  }
-  void superTearDown() {
-    super.tearDown()
-  }
-
-  @Override protected void tearDown() {
-    edt { superTearDown() }
-  }
-
-  protected void doHighlighting() {
-    edt { myFixture.doHighlighting() }
+    myTester = new CompletionAutoPopupTester(myFixture)
   }
 
   void type(String s) {
     myTester.typeWithPauses(s)
   }
 
-  protected void joinCompletion() {
-    myTester.joinCompletion()
-  }
-
-  protected def joinCommit(Closure c1={}) {
-    myTester.joinCommit(c1)
-  }
-
-  protected void joinAutopopup() {
-    myTester.joinAutopopup()
-  }
-
-  protected def joinAlarm() {
-    myTester.joinAlarm()
-  }
-
-  @Override protected void runTest() {
-    myTester.runWithAutoPopupEnabled { runTestBare() }
-  }
-
   @Override protected boolean runInDispatchThread() {
     return false;
   }
 
   @Override protected void invokeTestRunnable(Runnable runnable) {
-    runnable.run()
+    myTester.runWithAutoPopupEnabled(runnable)
   }
 
   LookupImpl getLookup() {