diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java
index d0d22c22e14..73fa75e8472 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidBoxTestGenerated.java
@@ -16,84 +16,94 @@
 
 package org.jetbrains.jet.lang.resolve.android;
 
-import junit.framework.Assert;
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 
-import org.jetbrains.jet.lang.resolve.android.AbstractAndroidBoxTest;
+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")
 @InnerTestClasses({AndroidBoxTestGenerated.Android.class, AndroidBoxTestGenerated.Invoke.class})
 public class AndroidBoxTestGenerated extends AbstractAndroidBoxTest {
     @TestMetadata("compiler/testData/codegen/android")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Android extends AbstractAndroidBoxTest {
         public void testAllFilesPresentInAndroid() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false);
         }
         
         @TestMetadata("fqNameInAttr")
         public void testFqNameInAttr() throws Exception {
-            doCompileAgainstAndroidSdkTest("compiler/testData/codegen/android/fqNameInAttr/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/fqNameInAttr/");
+            doCompileAgainstAndroidSdkTest(fileName);
         }
         
         @TestMetadata("fqNameInTag")
         public void testFqNameInTag() throws Exception {
-            doCompileAgainstAndroidSdkTest("compiler/testData/codegen/android/fqNameInTag/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/fqNameInTag/");
+            doCompileAgainstAndroidSdkTest(fileName);
         }
         
         @TestMetadata("manyWidgets")
         public void testManyWidgets() throws Exception {
-            doCompileAgainstAndroidSdkTest("compiler/testData/codegen/android/manyWidgets/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/manyWidgets/");
+            doCompileAgainstAndroidSdkTest(fileName);
         }
         
         @TestMetadata("multiFile")
         public void testMultiFile() throws Exception {
-            doCompileAgainstAndroidSdkTest("compiler/testData/codegen/android/multiFile/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/multiFile/");
+            doCompileAgainstAndroidSdkTest(fileName);
         }
         
         @TestMetadata("singleFile")
         public void testSingleFile() throws Exception {
-            doCompileAgainstAndroidSdkTest("compiler/testData/codegen/android/singleFile/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/singleFile/");
+            doCompileAgainstAndroidSdkTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/android")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Invoke extends AbstractAndroidBoxTest {
         public void testAllFilesPresentInInvoke() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false);
         }
         
         @TestMetadata("fqNameInAttr")
         public void testFqNameInAttr() throws Exception {
-            doFakeInvocationTest("compiler/testData/codegen/android/fqNameInAttr/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/fqNameInAttr/");
+            doFakeInvocationTest(fileName);
         }
         
         @TestMetadata("fqNameInTag")
         public void testFqNameInTag() throws Exception {
-            doFakeInvocationTest("compiler/testData/codegen/android/fqNameInTag/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/fqNameInTag/");
+            doFakeInvocationTest(fileName);
         }
         
         @TestMetadata("manyWidgets")
         public void testManyWidgets() throws Exception {
-            doFakeInvocationTest("compiler/testData/codegen/android/manyWidgets/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/manyWidgets/");
+            doFakeInvocationTest(fileName);
         }
         
         @TestMetadata("multiFile")
         public void testMultiFile() throws Exception {
-            doFakeInvocationTest("compiler/testData/codegen/android/multiFile/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/multiFile/");
+            doFakeInvocationTest(fileName);
         }
         
         @TestMetadata("singleFile")
         public void testSingleFile() throws Exception {
-            doFakeInvocationTest("compiler/testData/codegen/android/singleFile/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/android/singleFile/");
+            doFakeInvocationTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java
index b034d4f4994..0888d0e0ca9 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/android/AndroidXml2KConversionTestGenerated.java
@@ -16,64 +16,70 @@
 
 package org.jetbrains.jet.lang.resolve.android;
 
-import junit.framework.Assert;
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 
-import org.jetbrains.jet.lang.resolve.android.AbstractAndroidXml2KConversionTest;
+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")
 @InnerTestClasses({AndroidXml2KConversionTestGenerated.Simple.class, AndroidXml2KConversionTestGenerated.Exceptions.class})
 public class AndroidXml2KConversionTestGenerated extends AbstractAndroidXml2KConversionTest {
     @TestMetadata("compiler/testData/android/converter/simple")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Simple extends AbstractAndroidXml2KConversionTest {
         public void testAllFilesPresentInSimple() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/android/converter/simple"), Pattern.compile("^([^\\.]+)$"), false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/android/converter/simple"), Pattern.compile("^([^\\.]+)$"), false);
         }
         
         @TestMetadata("fqNameInAttr")
         public void testFqNameInAttr() throws Exception {
-            doTest("compiler/testData/android/converter/simple/fqNameInAttr/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/fqNameInAttr/");
+            doTest(fileName);
         }
         
         @TestMetadata("fqNameInTag")
         public void testFqNameInTag() throws Exception {
-            doTest("compiler/testData/android/converter/simple/fqNameInTag/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/fqNameInTag/");
+            doTest(fileName);
         }
         
         @TestMetadata("multiFile")
         public void testMultiFile() throws Exception {
-            doTest("compiler/testData/android/converter/simple/multiFile/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/multiFile/");
+            doTest(fileName);
         }
         
         @TestMetadata("noIds")
         public void testNoIds() throws Exception {
-            doTest("compiler/testData/android/converter/simple/noIds/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/noIds/");
+            doTest(fileName);
         }
         
         @TestMetadata("singleFile")
         public void testSingleFile() throws Exception {
-            doTest("compiler/testData/android/converter/simple/singleFile/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/simple/singleFile/");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/android/converter/exceptions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Exceptions extends AbstractAndroidXml2KConversionTest {
         public void testAllFilesPresentInExceptions() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/android/converter/exceptions"), Pattern.compile("^([^\\.]+)$"), false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/android/converter/exceptions"), Pattern.compile("^([^\\.]+)$"), false);
         }
         
         @TestMetadata("noManifest")
         public void testNoManifest() throws Exception {
-            doNoManifestTest("compiler/testData/android/converter/exceptions/noManifest/");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/android/converter/exceptions/noManifest/");
+            doNoManifestTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java
index 90aa49cdf53..f84163738ac 100644
--- a/idea/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/android/AndroidCompletionTestGenerated.java
@@ -16,7 +16,11 @@
 
 package org.jetbrains.jet.android;
 
+import com.intellij.testFramework.TestDataPath;
+import junit.framework.Test;
+import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 
 import java.io.File;
@@ -25,29 +29,34 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/android/completion")
+@TestDataPath("$PROJECT_ROOT")
 public class AndroidCompletionTestGenerated extends AbstractAndroidCompletionTest {
-    public void SKIPtestAllFilesPresentInCompletion() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/android/completion"), Pattern.compile("^([^\\.]+)$"), false);
+    public void testAllFilesPresentInCompletion() throws Exception {
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/completion"), Pattern.compile("^([^\\.]+)$"), false);
     }
     
     @TestMetadata("fqNameInAttr")
     public void testFqNameInAttr() throws Exception {
-        doTest("idea/testData/android/completion/fqNameInAttr/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/android/completion/fqNameInAttr/");
+        doTest(fileName);
     }
     
     @TestMetadata("fqNameInTag")
     public void testFqNameInTag() throws Exception {
-        doTest("idea/testData/android/completion/fqNameInTag/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/android/completion/fqNameInTag/");
+        doTest(fileName);
     }
     
     @TestMetadata("multiFile")
     public void testMultiFile() throws Exception {
-        doTest("idea/testData/android/completion/multiFile/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/android/completion/multiFile/");
+        doTest(fileName);
     }
     
     @TestMetadata("propertiesSimple")
     public void testPropertiesSimple() throws Exception {
-        doTest("idea/testData/android/completion/propertiesSimple/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/android/completion/propertiesSimple/");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java b/idea/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java
index 913047bd3b2..7bcbaff521c 100644
--- a/idea/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/android/CrossParserTestGenerated.java
@@ -16,49 +16,53 @@
 
 package org.jetbrains.jet.android;
 
-import junit.framework.Assert;
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
-import java.io.File;
-import java.util.regex.Pattern;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
 
-import org.jetbrains.jet.android.AbstractCrossParserTest;
+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("idea/testData/android/crossParser")
+@TestDataPath("$PROJECT_ROOT")
 public class CrossParserTestGenerated extends AbstractCrossParserTest {
     public void testAllFilesPresentInCrossParser() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/android/crossParser"), Pattern.compile("^([^\\.]+)$"), false);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/crossParser"), Pattern.compile("^([^\\.]+)$"), false);
     }
     
     @TestMetadata("fqNameInAttr")
     public void testFqNameInAttr() throws Exception {
-        doTest("idea/testData/android/crossParser/fqNameInAttr/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/fqNameInAttr/");
+        doTest(fileName);
     }
     
     @TestMetadata("fqNameInTag")
     public void testFqNameInTag() throws Exception {
-        doTest("idea/testData/android/crossParser/fqNameInTag/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/fqNameInTag/");
+        doTest(fileName);
     }
     
     @TestMetadata("multiFile")
     public void testMultiFile() throws Exception {
-        doTest("idea/testData/android/crossParser/multiFile/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/multiFile/");
+        doTest(fileName);
     }
     
     @TestMetadata("noIds")
     public void testNoIds() throws Exception {
-        doTest("idea/testData/android/crossParser/noIds/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/noIds/");
+        doTest(fileName);
     }
     
     @TestMetadata("singleFile")
     public void testSingleFile() throws Exception {
-        doTest("idea/testData/android/crossParser/singleFile/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/android/crossParser/singleFile/");
+        doTest(fileName);
     }
     
 }