diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTest.java
index 1fe81f398eaa..9a0e8c44856e 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTest.java
@@ -15,8 +15,8 @@
  */
 package org.jetbrains.plugins.github;
 
-import com.intellij.mock.MockProgressIndicator;
 import com.intellij.notification.NotificationType;
+import com.intellij.openapi.progress.DumbProgressIndicator;
 import com.intellij.openapi.progress.ProgressIndicator;
 import org.jetbrains.plugins.github.util.GithubAuthData;
 import org.jetbrains.plugins.github.util.GithubAuthDataHolder;
@@ -30,7 +30,7 @@ import static org.jetbrains.plugins.github.api.GithubGist.FileContent;
  * @author Aleksey Pivovarov
  */
 public class GithubCreateGistTest extends GithubCreateGistTestBase {
-  private final ProgressIndicator myIndicator = new MockProgressIndicator();
+  private final ProgressIndicator myIndicator = DumbProgressIndicator.INSTANCE;
 
   public void testSimple() throws Throwable {
     List<FileContent> expected = createContent();
diff --git a/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java b/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java
index da64988f5b16..7fe96c08e987 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java
@@ -206,4 +206,9 @@ public abstract class GithubTest extends GitPlatformTest {
 
   protected void afterTest() throws Exception {
   }
+
+  @Override
+  protected boolean runInDispatchThread() {
+    return true;
+  }
 }