diff --git a/compiler/testData/resolve/Basic.jet b/compiler/testData/resolve/Basic.resolve
similarity index 100%
rename from compiler/testData/resolve/Basic.jet
rename to compiler/testData/resolve/Basic.resolve
diff --git a/compiler/testData/resolve/ClassObjects.jet b/compiler/testData/resolve/ClassObjects.resolve
similarity index 100%
rename from compiler/testData/resolve/ClassObjects.jet
rename to compiler/testData/resolve/ClassObjects.resolve
diff --git a/compiler/testData/resolve/Classifiers.jet b/compiler/testData/resolve/Classifiers.resolve
similarity index 100%
rename from compiler/testData/resolve/Classifiers.jet
rename to compiler/testData/resolve/Classifiers.resolve
diff --git a/compiler/testData/resolve/ErrorSupertype.jet b/compiler/testData/resolve/ErrorSupertype.resolve
similarity index 100%
rename from compiler/testData/resolve/ErrorSupertype.jet
rename to compiler/testData/resolve/ErrorSupertype.resolve
diff --git a/compiler/testData/resolve/ExtensionFunctions.jet b/compiler/testData/resolve/ExtensionFunctions.resolve
similarity index 100%
rename from compiler/testData/resolve/ExtensionFunctions.jet
rename to compiler/testData/resolve/ExtensionFunctions.resolve
diff --git a/compiler/testData/resolve/FunctionVariable.jet b/compiler/testData/resolve/FunctionVariable.resolve
similarity index 100%
rename from compiler/testData/resolve/FunctionVariable.jet
rename to compiler/testData/resolve/FunctionVariable.resolve
diff --git a/compiler/testData/resolve/LocalObjects.jet b/compiler/testData/resolve/LocalObjects.resolve
similarity index 100%
rename from compiler/testData/resolve/LocalObjects.jet
rename to compiler/testData/resolve/LocalObjects.resolve
diff --git a/compiler/testData/resolve/Namespaces.jet b/compiler/testData/resolve/Namespaces.resolve
similarity index 100%
rename from compiler/testData/resolve/Namespaces.jet
rename to compiler/testData/resolve/Namespaces.resolve
diff --git a/compiler/testData/resolve/NestedObjects.jet b/compiler/testData/resolve/NestedObjects.resolve
similarity index 100%
rename from compiler/testData/resolve/NestedObjects.jet
rename to compiler/testData/resolve/NestedObjects.resolve
diff --git a/compiler/testData/resolve/NoReferenceForErrorAnnotation.jet b/compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve
similarity index 100%
rename from compiler/testData/resolve/NoReferenceForErrorAnnotation.jet
rename to compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve
diff --git a/compiler/testData/resolve/Objects.jet b/compiler/testData/resolve/Objects.resolve
similarity index 100%
rename from compiler/testData/resolve/Objects.jet
rename to compiler/testData/resolve/Objects.resolve
diff --git a/compiler/testData/resolve/PrimaryConstructorParameters.jet b/compiler/testData/resolve/PrimaryConstructorParameters.resolve
similarity index 100%
rename from compiler/testData/resolve/PrimaryConstructorParameters.jet
rename to compiler/testData/resolve/PrimaryConstructorParameters.resolve
diff --git a/compiler/testData/resolve/PrimaryConstructors.jet b/compiler/testData/resolve/PrimaryConstructors.resolve
similarity index 100%
rename from compiler/testData/resolve/PrimaryConstructors.jet
rename to compiler/testData/resolve/PrimaryConstructors.resolve
diff --git a/compiler/testData/resolve/Projections.jet b/compiler/testData/resolve/Projections.resolve
similarity index 100%
rename from compiler/testData/resolve/Projections.jet
rename to compiler/testData/resolve/Projections.resolve
diff --git a/compiler/testData/resolve/ResolveOfInfixExpressions.jet b/compiler/testData/resolve/ResolveOfInfixExpressions.resolve
similarity index 100%
rename from compiler/testData/resolve/ResolveOfInfixExpressions.jet
rename to compiler/testData/resolve/ResolveOfInfixExpressions.resolve
diff --git a/compiler/testData/resolve/ResolveToJava.jet b/compiler/testData/resolve/ResolveToJava.resolve
similarity index 100%
rename from compiler/testData/resolve/ResolveToJava.jet
rename to compiler/testData/resolve/ResolveToJava.resolve
diff --git a/compiler/testData/resolve/ResolveToJava2.jet b/compiler/testData/resolve/ResolveToJava2.resolve
similarity index 100%
rename from compiler/testData/resolve/ResolveToJava2.jet
rename to compiler/testData/resolve/ResolveToJava2.resolve
diff --git a/compiler/testData/resolve/ResolveToJava3.jet b/compiler/testData/resolve/ResolveToJava3.resolve
similarity index 100%
rename from compiler/testData/resolve/ResolveToJava3.jet
rename to compiler/testData/resolve/ResolveToJava3.resolve
diff --git a/compiler/testData/resolve/ResolveToJavaTypeTransform.jet b/compiler/testData/resolve/ResolveToJavaTypeTransform.resolve
similarity index 100%
rename from compiler/testData/resolve/ResolveToJavaTypeTransform.jet
rename to compiler/testData/resolve/ResolveToJavaTypeTransform.resolve
diff --git a/compiler/testData/resolve/ScopeInteraction.jet b/compiler/testData/resolve/ScopeInteraction.resolve
similarity index 100%
rename from compiler/testData/resolve/ScopeInteraction.jet
rename to compiler/testData/resolve/ScopeInteraction.resolve
diff --git a/compiler/testData/resolve/StringTemplates.jet b/compiler/testData/resolve/StringTemplates.resolve
similarity index 100%
rename from compiler/testData/resolve/StringTemplates.jet
rename to compiler/testData/resolve/StringTemplates.resolve
diff --git a/compiler/testData/resolve/Super.jet b/compiler/testData/resolve/Super.resolve
similarity index 100%
rename from compiler/testData/resolve/Super.jet
rename to compiler/testData/resolve/Super.resolve
diff --git a/compiler/testData/resolve/TryCatch.jet b/compiler/testData/resolve/TryCatch.resolve
similarity index 100%
rename from compiler/testData/resolve/TryCatch.jet
rename to compiler/testData/resolve/TryCatch.resolve
diff --git a/compiler/testData/resolve/kt304.jet b/compiler/testData/resolve/kt304.resolve
similarity index 100%
rename from compiler/testData/resolve/kt304.jet
rename to compiler/testData/resolve/kt304.resolve
diff --git a/compiler/testData/resolve/labels/labelForPropertyInGetter.jet b/compiler/testData/resolve/labels/labelForPropertyInGetter.resolve
similarity index 100%
rename from compiler/testData/resolve/labels/labelForPropertyInGetter.jet
rename to compiler/testData/resolve/labels/labelForPropertyInGetter.resolve
diff --git a/compiler/testData/resolve/labels/labelForPropertyInSetter.jet b/compiler/testData/resolve/labels/labelForPropertyInSetter.resolve
similarity index 100%
rename from compiler/testData/resolve/labels/labelForPropertyInSetter.jet
rename to compiler/testData/resolve/labels/labelForPropertyInSetter.resolve
diff --git a/compiler/testData/resolve/regressions/kt300.jet b/compiler/testData/resolve/regressions/kt300.resolve
similarity index 100%
rename from compiler/testData/resolve/regressions/kt300.jet
rename to compiler/testData/resolve/regressions/kt300.resolve
diff --git a/compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.jet b/compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.resolve
similarity index 100%
rename from compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.jet
rename to compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.resolve
diff --git a/compiler/testData/resolve/varargs/NilaryVsVararg.jet b/compiler/testData/resolve/varargs/NilaryVsVararg.resolve
similarity index 100%
rename from compiler/testData/resolve/varargs/NilaryVsVararg.jet
rename to compiler/testData/resolve/varargs/NilaryVsVararg.resolve
diff --git a/compiler/testData/resolve/varargs/UnaryVsVararg.jet b/compiler/testData/resolve/varargs/UnaryVsVararg.resolve
similarity index 100%
rename from compiler/testData/resolve/varargs/UnaryVsVararg.jet
rename to compiler/testData/resolve/varargs/UnaryVsVararg.resolve
diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
index af71fa77f9d..eb4191c2c0a 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
@@ -159,13 +159,6 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
         return getHomeDirectory() + "/compiler/testData";
     }
 
-/*
-    @Override
-    protected Sdk getProjectJDK() {
-        return PluginTestCaseBase.jdkFromIdeaHome();
-    }
-*/
-
     private static String getHomeDirectory() {
         return new File(PathManager.getResourceRoot(JetParsingTest.class, "/org/jetbrains/jet/parsing/JetParsingTest.class")).getParentFile().getParentFile().getParent();
     }
@@ -181,15 +174,14 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
     }
 
     public static Test suite() {
-//        TestSuite suite = new TestSuite();
-//        suite.addTest(new JetResolveTest("/resolve/Basic.jet", "basic"));
-//        return suite;
-        return JetTestCaseBuilder.suiteForDirectory(getHomeDirectory() + "/compiler/testData/", "/resolve/", true, new JetTestCaseBuilder.NamedTestFactory() {
-            @NotNull
-            @Override
-            public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) {
-                return new JetResolveTest(dataPath + "/" + name + ".jet", name);
-            }
-        });
+        return JetTestCaseBuilder.suiteForDirectory(getHomeDirectory() + "/compiler/testData/", "/resolve/",
+                                                    true, JetTestCaseBuilder.filterByExtension("resolve"),
+                                                    new JetTestCaseBuilder.NamedTestFactory() {
+                                                        @NotNull
+                                                        @Override
+                                                        public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) {
+                                                            return new JetResolveTest(dataPath + "/" + name + ".resolve", name);
+                                                        }
+                                                    });
     }
 }