diff --git a/plugins/git4idea/git4idea.iml b/plugins/git4idea/git4idea.iml
index 2c15561b8051..76fdf85125d1 100644
--- a/plugins/git4idea/git4idea.iml
+++ b/plugins/git4idea/git4idea.iml
@@ -9,7 +9,6 @@
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/testFramework" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test-stepdefs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test-features" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/gitlog" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy
index 3fd8dae733a9..e109fe74ce9f 100644
--- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy
+++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.groovy
@@ -37,6 +37,7 @@ import git4idea.test.GitLightTest
 import org.jetbrains.annotations.NotNull
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 
 import java.util.regex.Matcher
@@ -51,6 +52,7 @@ import static junit.framework.Assert.*
  *
  * @author Kirill Likhodedov
  */
+@Ignore
 class GitBranchWorkerTest extends GitLightTest {
 
   private GitRepository myUltimate
diff --git a/plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.groovy b/plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.groovy
index 5eb63813eb4a..da7de5b7fefa 100644
--- a/plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.groovy
+++ b/plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.groovy
@@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import git4idea.test.GitLightTest
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 
 import static com.intellij.dvcs.test.Executor.cd
@@ -31,6 +32,7 @@ import static org.junit.Assert.assertTrue
  *
  * @author Kirill Likhodedov
  */
+@Ignore
 class GitCrlfProblemsDetectorTest extends GitLightTest {
 
   private String myOldGlobalAutoCrlfValue
diff --git a/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderNewTest.groovy b/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderNewTest.groovy
index ffb238d2909c..afe96be4b817 100644
--- a/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderNewTest.groovy
+++ b/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderNewTest.groovy
@@ -21,6 +21,7 @@ import git4idea.GitLocalBranch
 import git4idea.test.GitLightTest
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 
 import static git4idea.test.GitScenarios.commit
@@ -33,6 +34,7 @@ import static junit.framework.Assert.assertNull
  *
  * @author Kirill Likhodedov
  */
+@Ignore
 class GitRepositoryReaderNewTest extends GitLightTest {
 
   GitRepository myRepository