diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 42c81e400be..3e1da33049a 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -3626,6 +3626,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
             public static class Synthesized extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInSynthesized() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3633,7 +3635,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("enumValuesValueOf.kt")
                 public void testEnumValuesValueOf() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -3682,11 +3685,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInEnum() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/enum"), Pattern.compile("^(.+)\\.kt$"), true);
             }
-            @TestMetadata("classObjectOfPrivateEnum.kt")
-            public void testClassObjectOfPrivateEnum() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt");
-                doTest(fileName);
-            }
             
             @TestMetadata("classObjectInEnum.kt")
             public void testClassObjectInEnum() throws Exception {
@@ -3828,7 +3826,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("valuesValueOfAndEntriesAccessibility.kt")
             public void testValuesValueOfAndEntriesAccessibility() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/enum/inner")
@@ -6171,7 +6170,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("packagePrivateClassStaticMember.kt")
             public void testPackagePrivateClassStaticMember() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("packageVisibility.kt")
@@ -6182,7 +6182,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("privateNestedClassStaticMember.kt")
             public void testPrivateNestedClassStaticMember() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("protectedStaticSamePackage.kt")
@@ -7646,7 +7647,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("EnumEntriesAndClassObjectMembers.kt")
             public void testEnumEntriesAndClassObjectMembers() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2247.kt")
diff --git a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
index 771ed7ba5b3..b1dc1b7de25 100644
--- a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
@@ -158,6 +158,7 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
         @TestMetadata("compiler/testData/cli/jvm/wrongKotlinSignatureLib")
         @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
+        @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class)
         public static class WrongKotlinSignatureLib extends AbstractKotlincExecutableTest {
             public void testAllFilesPresentInWrongKotlinSignatureLib() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm/wrongKotlinSignatureLib"), Pattern.compile("^(.+)\\.args$"), true);
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
index ba760ce0562..4e44ef08a5c 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -2514,7 +2514,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("classObjectInEnum.kt")
         public void testClassObjectInEnum() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/classObjectInEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/classObjectInEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyEnumValuesValueOf.kt")
@@ -3685,7 +3686,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("extensionToNested.kt")
         public void testExtensionToNested() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/extensionToNested.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/extensionToNested.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("importNestedClass.kt")
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java
index caf1921412e..c646d39fb89 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java
@@ -46,7 +46,8 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
     
     @TestMetadata("ClassObjectInEnum.A.kt")
     public void testClassObjectInEnum() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectMember.A.kt")
diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
index 8e5e7ec15aa..782e6da01ae 100644
--- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
@@ -97,7 +97,8 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
         @TestMetadata("ClassObjectInEnum.kt")
         public void testClassObjectInEnum() throws Exception {
-            doTest("idea/testData/checker/ClassObjectInEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ClassObjectInEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjects.kt")