diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java
index de597769c92..7088630760e 100644
--- a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java
+++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java
@@ -28,7 +28,6 @@ import com.intellij.facet.FacetManager;
 import com.intellij.facet.ModifiableFacetModel;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.impl.ComponentManagerImpl;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.openapi.roots.ModuleRootModificationUtil;
@@ -54,6 +53,7 @@ import org.jetbrains.android.facet.AndroidRootUtil;
 import org.jetbrains.android.formatter.AndroidXmlCodeStyleSettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.picocontainer.MutablePicoContainer;
 
 import java.io.File;
@@ -79,6 +79,8 @@ public abstract class AndroidTestCase extends AndroidTestBase {
     protected void setUp() throws Exception {
         super.setUp();
 
+        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory());
+
         TestFixtureBuilder<IdeaProjectTestFixture> projectBuilder = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getName());
         myFixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(projectBuilder.getFixture());
         JavaModuleFixtureBuilder moduleFixtureBuilder = projectBuilder.addModule(JavaModuleFixtureBuilder.class);
@@ -164,6 +166,7 @@ public abstract class AndroidTestCase extends AndroidTestBase {
         }
         finally {
             super.tearDown();
+            VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
         }
     }
 
diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/lint/AbstractKotlinLintTest.kt b/idea/idea-android/tests/org/jetbrains/kotlin/android/lint/AbstractKotlinLintTest.kt
index 5bc56689d24..f9f89031f1a 100644
--- a/idea/idea-android/tests/org/jetbrains/kotlin/android/lint/AbstractKotlinLintTest.kt
+++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/lint/AbstractKotlinLintTest.kt
@@ -29,7 +29,6 @@ abstract class AbstractKotlinLintTest : KotlinAndroidTestCase() {
         ConfigLibraryUtil.configureKotlinRuntime(myModule)
         AndroidLintInspectionBase.invalidateInspectionShortName2IssueMap()
         // needs access to .class files in kotlin runtime jar
-        myFixture.allowTreeAccessForAllFiles()
     }
 
     override fun tearDown() {