diff --git a/.idea/libraries/Mocks.xml b/.idea/libraries/Mocks.xml
index 2f65ac29d91e..7e4ee7018f4e 100644
--- a/.idea/libraries/Mocks.xml
+++ b/.idea/libraries/Mocks.xml
@@ -12,7 +12,6 @@
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-2.5.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-junit4-2.5.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-legacy-2.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/jmockit.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
@@ -21,7 +20,6 @@
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-2.5.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-junit4-2.5.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-legacy-2.5.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/jmockit.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyAction.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyAction.java
index c3472677729f..8c191178621c 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyAction.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyAction.java
@@ -23,15 +23,19 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiCompiledElement;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.idea.maven.model.MavenId;
 import org.jetbrains.plugins.gradle.util.GradleBundle;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 import org.jetbrains.plugins.groovy.GroovyFileType;
 
+import java.util.List;
+
 /**
  * @author Vladislav.Soroka
  * @since 10/23/13
  */
 public class AddGradleDslDependencyAction extends CodeInsightAction {
+  static final ThreadLocal<List<MavenId>> TEST_THREAD_LOCAL = new ThreadLocal<List<MavenId>>();
 
   public AddGradleDslDependencyAction() {
     getTemplatePresentation().setDescription(GradleBundle.message("gradle.codeInsight.action.add_maven_dependency.description"));
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java
index f403e5f7cade..02dae6b24ac8 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java
@@ -17,6 +17,7 @@ package org.jetbrains.plugins.gradle.integrations.maven.codeInsight.actions;
 
 import com.intellij.codeInsight.CodeInsightActionHandler;
 import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
@@ -50,7 +51,14 @@ class AddGradleDslDependencyActionHandler implements CodeInsightActionHandler {
   public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
     if (!CodeInsightUtilBase.prepareEditorForWrite(editor)) return;
 
-    final List<MavenId> ids = MavenArtifactSearchDialog.searchForArtifact(project, ContainerUtil.<MavenDomDependency>emptyList());
+    final List<MavenId> ids;
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      ids = AddGradleDslDependencyAction.TEST_THREAD_LOCAL.get();
+    }
+    else {
+      ids = MavenArtifactSearchDialog.searchForArtifact(project, ContainerUtil.<MavenDomDependency>emptyList());
+    }
+
     if (ids.isEmpty()) return;
 
     new WriteCommandAction.Simple(project, GradleBundle.message("gradle.codeInsight.action.add_maven_dependency.text"), file) {
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java
index a7e5c3b40110..c2daa4fca58b 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java
@@ -20,10 +20,6 @@ import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
 import com.intellij.util.containers.ContainerUtil;
-import mockit.Mocked;
-import mockit.NonStrictExpectations;
-import org.jetbrains.idea.maven.dom.model.MavenDomDependency;
-import org.jetbrains.idea.maven.indices.MavenArtifactSearchDialog;
 import org.jetbrains.idea.maven.model.MavenId;
 
 import java.io.File;
@@ -34,31 +30,17 @@ import java.io.File;
  */
 public class AddGradleDslDependencyActionTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  @Mocked(stubOutClassInitialization = true) final MavenArtifactSearchDialog unused = null;
-
   public AddGradleDslDependencyActionTest() {
     IdeaTestCase.initPlatformPrefix();
   }
 
   public void testAddMavenDependencyInEmptyFile() throws Exception {
-    new NonStrictExpectations() {
-      {
-        MavenArtifactSearchDialog.searchForArtifact(getProject(), ContainerUtil.<MavenDomDependency>emptyList());
-        result = ContainerUtil.list(new MavenId("testGroupId", "testArtifactId", "1.0"));
-      }
-    };
-
+    AddGradleDslDependencyAction.TEST_THREAD_LOCAL.set(ContainerUtil.list(new MavenId("testGroupId", "testArtifactId", "1.0")));
     doTest("testAddMavenDependencyInEmptyFile.gradle");
   }
 
   public void testAddMavenDependencyIntoExistingBlock() throws Exception {
-    new NonStrictExpectations() {
-      {
-        MavenArtifactSearchDialog.searchForArtifact(getProject(), ContainerUtil.<MavenDomDependency>emptyList());
-        result = ContainerUtil.list(new MavenId("testGroupId", "testArtifactId", "1.0"));
-      }
-    };
-
+    AddGradleDslDependencyAction.TEST_THREAD_LOCAL.set(ContainerUtil.list(new MavenId("testGroupId", "testArtifactId", "1.0")));
     doTest("testAddMavenDependencyIntoExistingBlock.gradle");
   }