diff --git a/plugins/gradle/gradle.iml b/plugins/gradle/gradle.iml
index 30858f5e8b21..a3452f1859a3 100644
--- a/plugins/gradle/gradle.iml
+++ b/plugins/gradle/gradle.iml
@@ -31,6 +31,7 @@
     </orderEntry>
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
+    <orderEntry type="module" module-name="testFramework" scope="TEST" />
   </component>
 </module>
 
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/RichTextControlBuilderTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/RichTextControlBuilderTest.java
index 07651dc72b97..a140c55fc217 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/RichTextControlBuilderTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/RichTextControlBuilderTest.java
@@ -1,5 +1,7 @@
 package org.jetbrains.plugins.gradle.util;
 
+import com.intellij.testFramework.SkipInHeadlessEnvironment;
+import org.jetbrains.plugins.gradle.ui.RichTextControlBuilder;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
@@ -15,6 +17,7 @@ import org.junit.runner.RunWith;
  * @since 01/17/2012
  */
 @RunWith(JMock.class)
+@SkipInHeadlessEnvironment
 public class RichTextControlBuilderTest {
 
   private static final String META_KEY = "my-key";