diff --git a/.gitignore b/.gitignore
index b08ded4fb6e..5e893f3b9fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
 .DS_Store
 .idea/shelf
-/android.tests.dependencies
 /confluence/target
 /dependencies/repo
+/android.tests.dependencies
+/dependencies/android.tests.dependencies
 /dist
 /local
 /gh-pages
diff --git a/compiler/android-tests/android-module/local.properties b/compiler/android-tests/android-module/local.properties
index 7400dc199b1..db64df607b1 100644
--- a/compiler/android-tests/android-module/local.properties
+++ b/compiler/android-tests/android-module/local.properties
@@ -8,5 +8,5 @@
 # For customization when using a Version Control System, please read the
 # header note.
 #sdk.dir=compiler/android-tests/android-module/android-sdk/android-sdk-windows
-sdk.dir=../../../android.tests.dependencies/android-sdk
+sdk.dir=../../../dependencies/android.tests.dependencies/android-sdk
 
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java
index 39ea00fbbc8..cc2ab26d506 100644
--- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java
+++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java
@@ -77,7 +77,7 @@ public class PathManager {
     }
 
     public String getDependenciesRoot() {
-        return rootFolder + "/android.tests.dependencies";
+        return rootFolder + "/dependencies/android.tests.dependencies";
     }
 
     public String getGradleBinFolder() {
diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
index 316f64b772f..fa3606f6ede 100644
--- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
@@ -29,7 +29,6 @@ class CodeConformanceTest : TestCase() {
         private val SOURCES_BUNCH_FILE_PATTERN = Pattern.compile("(.+\\.java|.+\\.kt|.+\\.js)(\\.\\w+)?")
         private const val MAX_STEPS_COUNT = 100
         private val EXCLUDED_FILES_AND_DIRS = listOf(
-            "android.tests.dependencies",
             "buildSrc",
             "core/reflection.jvm/src/kotlin/reflect/jvm/internal/pcollections",
             "js/js.tests/.gradle",