diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java
index cc5e5c52c38b..19337a39a90c 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java
@@ -152,6 +152,12 @@ public class GradleExecutionHelper {
       commandLineArgs.add(GradleConstants.OFFLINE_MODE_CMD_OPTION);
     }
 
+    final Application application = ApplicationManager.getApplication();
+    if(application != null && application.isUnitTestMode()) {
+      commandLineArgs.add("--info");
+      commandLineArgs.add("--recompile-scripts");
+    }
+
     if (!commandLineArgs.isEmpty()) {
       LOG.info("Passing command-line args to Gradle Tooling API: " + commandLineArgs);
       // filter nulls and empty strings
@@ -224,7 +230,7 @@ public class GradleExecutionHelper {
         }
       }
       catch (Throwable e) {
-        // ignore
+        LOG.debug("Gradle connection close error", e);
       }
     }
   }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
index 2cf4c7125918..c655f96344a7 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
@@ -30,9 +30,9 @@ import org.gradle.wrapper.GradleWrapperMain;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.plugins.gradle.remote.GradleJavaHelper;
 import org.jetbrains.plugins.gradle.settings.DistributionType;
 import org.jetbrains.plugins.gradle.settings.GradleProjectSettings;
+import org.jetbrains.plugins.gradle.settings.GradleSettings;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 import org.junit.Rule;
 import org.junit.rules.TestName;
@@ -73,6 +73,7 @@ public abstract class GradleImportingTestCase extends ExternalSystemImportingTes
   public void setUp() throws Exception {
     super.setUp();
     myProjectSettings = new GradleProjectSettings();
+    GradleSettings.getInstance(myProject).setGradleVmOptions("-Xmx64m -XX:MaxPermSize=64m");
     System.setProperty(ExternalSystemExecutionSettings.REMOTE_PROCESS_IDLE_TTL_IN_MS_KEY, String.valueOf(GRADLE_DAEMON_TTL_MS));
     configureWrapper();
   }
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
index 3874bd2cab04..f556d474bba7 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
@@ -123,14 +123,19 @@ public abstract class AbstractModelBuilderTest {
     ((DefaultGradleConnector)connector).daemonMaxIdleTime(daemonMaxIdleTime, TimeUnit.SECONDS);
     ProjectConnection connection = connector.connect();
 
-    final ProjectImportAction projectImportAction = new ProjectImportAction(false);
-    projectImportAction.addExtraProjectModelClasses(getModels());
-    BuildActionExecuter<ProjectImportAction.AllModels> buildActionExecutor = connection.action(projectImportAction);
-    File initScript = GradleExecutionHelper.generateInitScript(false, getToolingExtensionClasses());
-    assertNotNull(initScript);
-    buildActionExecutor.withArguments("--recompile-scripts", GradleConstants.INIT_SCRIPT_CMD_OPTION, initScript.getAbsolutePath());
-    allModels = buildActionExecutor.run();
-    assertNotNull(allModels);
+    try {
+      final ProjectImportAction projectImportAction = new ProjectImportAction(false);
+      projectImportAction.addExtraProjectModelClasses(getModels());
+      BuildActionExecuter<ProjectImportAction.AllModels> buildActionExecutor = connection.action(projectImportAction);
+      File initScript = GradleExecutionHelper.generateInitScript(false, getToolingExtensionClasses());
+      assertNotNull(initScript);
+      buildActionExecutor.setJvmArguments("-Xmx64m", "-XX:MaxPermSize=64m");
+      buildActionExecutor.withArguments("--info", "--recompile-scripts", GradleConstants.INIT_SCRIPT_CMD_OPTION, initScript.getAbsolutePath());
+      allModels = buildActionExecutor.run();
+      assertNotNull(allModels);
+    } finally {
+      connection.close();
+    }
   }
 
   @NotNull