diff --git a/plugins/android-jps-plugin/android-jps-plugin.iml b/plugins/android-jps-plugin/android-jps-plugin.iml
index 707d7f8da33..ec54f2f32e5 100644
--- a/plugins/android-jps-plugin/android-jps-plugin.iml
+++ b/plugins/android-jps-plugin/android-jps-plugin.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -13,5 +14,8 @@
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="android-compiler-plugin" />
     <orderEntry type="module" module-name="util" scope="PROVIDED" />
+    <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
+    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps-plugin/testData/android/simple/AndroidManifest.xml b/plugins/android-jps-plugin/testData/android/simple/AndroidManifest.xml
similarity index 100%
rename from jps-plugin/testData/android/simple/AndroidManifest.xml
rename to plugins/android-jps-plugin/testData/android/simple/AndroidManifest.xml
diff --git a/jps-plugin/testData/android/simple/res/layout/main.xml b/plugins/android-jps-plugin/testData/android/simple/res/layout/main.xml
similarity index 100%
rename from jps-plugin/testData/android/simple/res/layout/main.xml
rename to plugins/android-jps-plugin/testData/android/simple/res/layout/main.xml
diff --git a/jps-plugin/testData/android/simple/simple.iml b/plugins/android-jps-plugin/testData/android/simple/simple.iml
similarity index 100%
rename from jps-plugin/testData/android/simple/simple.iml
rename to plugins/android-jps-plugin/testData/android/simple/simple.iml
diff --git a/jps-plugin/testData/android/simple/simple.ipr b/plugins/android-jps-plugin/testData/android/simple/simple.ipr
similarity index 100%
rename from jps-plugin/testData/android/simple/simple.ipr
rename to plugins/android-jps-plugin/testData/android/simple/simple.ipr
diff --git a/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt b/plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt
similarity index 100%
rename from jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt
rename to plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt
diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt b/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt
similarity index 100%
rename from jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt
rename to plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt
diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java b/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java
similarity index 77%
rename from jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java
rename to plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java
index bc507501bfc..0c59e68fbf1 100644
--- a/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java
+++ b/plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java
@@ -17,28 +17,28 @@
 package org.jetbrains.jet.jps.build.android;
 
 import com.intellij.testFramework.TestDataPath;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.jetbrains.jet.JUnit3RunnerWithInners;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
+import org.junit.runner.RunWith;
 
 import java.io.File;
 import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("jps-plugin/testData/android")
+@TestMetadata("plugins/android-jps-plugin/testData/android")
 @TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
 public class AndroidJpsTestCaseGenerated extends AbstractAndroidJpsTestCase {
     public void testAllFilesPresentInAndroid() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false);
     }
-    
+
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/android/simple/");
+        String fileName = JetTestUtils.navigationMetadata("plugins/android-jps-plugin/testData/android/simple/");
         doTest(fileName);
     }
-    
 }