diff --git a/plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/res/layout/layout.xml
similarity index 100%
rename from plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/layout/layout.xml
rename to plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/res/layout/layout.xml
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/res/layout/layout.xml
similarity index 100%
rename from plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/layout/layout.xml
rename to plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/res/layout/layout.xml
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/res/layout/layout.xml
similarity index 100%
rename from plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/layout/layout.xml
rename to plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/res/layout/layout.xml
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout1.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout1.kt
new file mode 100644
index 00000000000..1612fb29eb6
--- /dev/null
+++ b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout1.kt
@@ -0,0 +1,18 @@
+package kotlinx.android.synthetic.layout1
+
+import android.app.Activity
+import android.view.View
+import android.widget.*
+
+val Activity.frameLayout: FrameLayout
+    get() = findViewById(0) as FrameLayout
+
+val Activity.passwordField: TextView
+    get() = findViewById(0) as TextView
+
+val Activity.passwordCaption: EditText
+    get() = findViewById(0) as EditText
+
+val Activity.loginButton: Button
+    get() = findViewById(0) as Button
+
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/res/layout/layout.xml
similarity index 100%
rename from plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout/layout.xml
rename to plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/res/layout/layout.xml
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout/layout1.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/res/layout/layout1.xml
similarity index 100%
rename from plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout/layout1.xml
rename to plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/res/layout/layout1.xml
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout.kt
deleted file mode 100644
index deb2fee9df8..00000000000
--- a/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package kotlinx.android.synthetic.layout
-
-import android.app.Activity
-import android.view.View
-import android.widget.*
-
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/res/layout/layout.xml
similarity index 100%
rename from plugins/android-compiler-plugin/testData/android/converter/simple/noIds/layout/layout.xml
rename to plugins/android-compiler-plugin/testData/android/converter/simple/noIds/res/layout/layout.xml
diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/layout/layout.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/res/layout/layout.xml
similarity index 100%
rename from plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/layout/layout.xml
rename to plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/res/layout/layout.xml
diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt
index c2d18afeb5d..098d45b5070 100644
--- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt
+++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt
@@ -31,7 +31,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() {
 
     public fun doTest(path: String) {
         val jetCoreEnvironment = getEnvironment(path)
-        val parser = CliAndroidUIXmlProcessor(jetCoreEnvironment.getProject(), path + "AndroidManifest.xml", path + "/layout")
+        val parser = CliAndroidUIXmlProcessor(jetCoreEnvironment.getProject(), path + "AndroidManifest.xml", path + "/res")
 
         val actual = parser.parse()