diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
index 3a7765cdeaa..4e0ca0824ac 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jps.build;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ 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/incremental")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class})
 public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
     public void testAllFilesPresentInIncremental() throws Exception {
@@ -35,6 +37,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
     }
     
     @TestMetadata("jps-plugin/testData/incremental/circularDependency")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class CircularDependency extends AbstractIncrementalJpsTest {
         public void testAllFilesPresentInCircularDependency() throws Exception {
@@ -43,7 +46,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         
         @TestMetadata("simple")
         public void testSimple() throws Exception {
-            doTest("jps-plugin/testData/incremental/circularDependency/simple/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/circularDependency/simple/");
+            doTest(fileName);
         }
         
         public static Test innerSuite() {
@@ -54,21 +58,25 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
     }
     
     @TestMetadata("jps-plugin/testData/incremental/pureKotlin")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class PureKotlin extends AbstractIncrementalJpsTest {
         @TestMetadata("accessingFunctionsViaPackagePart")
         public void testAccessingFunctionsViaPackagePart() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/");
+            doTest(fileName);
         }
         
         @TestMetadata("accessingPropertiesViaField")
         public void testAccessingPropertiesViaField() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/");
+            doTest(fileName);
         }
         
         @TestMetadata("allConstants")
         public void testAllConstants() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/allConstants/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInPureKotlin() throws Exception {
@@ -77,172 +85,206 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         
         @TestMetadata("annotations")
         public void testAnnotations() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/annotations/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/");
+            doTest(fileName);
         }
         
         @TestMetadata("classInlineFunctionChanged")
         public void testClassInlineFunctionChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectConstantChanged")
         public void testClassObjectConstantChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("classRecreated")
         public void testClassRecreated() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classRecreated/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/");
+            doTest(fileName);
         }
         
         @TestMetadata("classSignatureChanged")
         public void testClassSignatureChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("classSignatureUnchanged")
         public void testClassSignatureUnchanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("constantsUnchanged")
         public void testConstantsUnchanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultArguments")
         public void testDefaultArguments() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/defaultArguments/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/");
+            doTest(fileName);
         }
         
         @TestMetadata("dependencyClassReferenced")
         public void testDependencyClassReferenced() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/");
+            doTest(fileName);
         }
         
         @TestMetadata("filesExchangePackages")
         public void testFilesExchangePackages() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/");
+            doTest(fileName);
         }
         
         @TestMetadata("independentClasses")
         public void testIndependentClasses() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/independentClasses/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/");
+            doTest(fileName);
         }
         
         @TestMetadata("inlineFunctionsCircularDependency")
         public void testInlineFunctionsCircularDependency() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/");
+            doTest(fileName);
         }
         
         @TestMetadata("inlineFunctionsUnchanged")
         public void testInlineFunctionsUnchanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("multiplePackagesModified")
         public void testMultiplePackagesModified() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/");
+            doTest(fileName);
         }
         
         @TestMetadata("objectValChanged")
         public void testObjectValChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/objectValChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectValChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("ourClassReferenced")
         public void testOurClassReferenced() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageConstantChanged")
         public void testPackageConstantChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFileAdded")
         public void testPackageFileAdded() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFileChangedPackage")
         public void testPackageFileChangedPackage() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFileChangedThenOtherRemoved")
         public void testPackageFileChangedThenOtherRemoved() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFileRemoved")
         public void testPackageFileRemoved() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFilesChangedInTurn")
         public void testPackageFilesChangedInTurn() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageInlineFunctionAccessingField")
         public void testPackageInlineFunctionAccessingField() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageInlineFunctionChanged")
         public void testPackageInlineFunctionChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageInlineFunctionFromOurPackage")
         public void testPackageInlineFunctionFromOurPackage() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageRecreated")
         public void testPackageRecreated() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageRecreated/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageRecreatedAfterRenaming")
         public void testPackageRecreatedAfterRenaming() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageRemoved")
         public void testPackageRemoved() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageRemoved/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/");
+            doTest(fileName);
         }
         
         @TestMetadata("returnTypeChanged")
         public void testReturnTypeChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleClassDependency")
         public void testSimpleClassDependency() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/");
+            doTest(fileName);
         }
         
         @TestMetadata("soleFileChangesPackage")
         public void testSoleFileChangesPackage() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/");
+            doTest(fileName);
         }
         
         @TestMetadata("topLevelFunctionSameSignature")
         public void testTopLevelFunctionSameSignature() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/");
+            doTest(fileName);
         }
         
         @TestMetadata("topLevelMembersInTwoFiles")
         public void testTopLevelMembersInTwoFiles() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/");
+            doTest(fileName);
         }
         
         @TestMetadata("traitClassObjectConstantChanged")
         public void testTraitClassObjectConstantChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/");
+            doTest(fileName);
         }
         
         public static Test innerSuite() {