diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
index d3e528afcf1..3936fbda67e 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
@@ -118,6 +118,7 @@ import org.jetbrains.jet.asJava.AbstractKotlinLightClassTest
 import org.jetbrains.jet.lang.resolve.java.AbstractJavaTypeSubstitutorTest
 import org.jetbrains.jet.plugin.intentions.declarations.AbstractJoinLinesTest
 import org.jetbrains.jet.codegen.AbstractScriptCodegenTest
+import org.jetbrains.jet.plugin.parameterInfo.AbstractFunctionParameterInfoTest
 
 fun main(args: Array<String>) {
     System.setProperty("java.awt.headless", "true")
@@ -355,6 +356,10 @@ fun main(args: Array<String>) {
             model("navigation/gotoSuper", extension = "test")
         }
 
+        testClass(javaClass<AbstractFunctionParameterInfoTest>()) {
+            model("parameterInfo/functionParameterInfo")
+        }
+
         testClass(javaClass<AbstractKotlinGotoTest>()) {
             model("navigation/gotoClass", testMethod = "doClassTest")
             model("navigation/gotoSymbol", testMethod = "doSymbolTest")
diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java
similarity index 74%
rename from idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
rename to idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java
index 83ba4b44d27..28e588e504f 100644
--- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java
@@ -26,71 +26,15 @@ import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.project.ResolveSessionForBodies;
 
-public class JetFunctionParameterInfoTest extends LightCodeInsightFixtureTestCase {
-    public void testInheritedFunctions() {
-        doTest();
-    }
-
-    public void testInheritedWithCurrentFunctions() {
-        doTest();
-    }
-
-    public void testNamedAndDefaultParameter() {
-        doTest();
-    }
-
-    public void testNamedParameter() {
-        doTest();
-    }
-
-    public void testNamedParameter2() {
-        doTest();
-    }
-
-    public void testNotGreen() {
-        doTest();
-    }
-
-    public void testNullableTypeCall() {
-        doTest();
-    }
-
-    public void testPrintln() {
-        doTest();
-    }
-
-    public void testSimple() {
-        doTest();
-    }
-
-    public void testSimpleConstructor() {
-        doTest();
-    }
-
-    public void testSuperConstructorCall() {
-        doTest();
-    }
-
-    public void testTwoFunctions() {
-        doTest();
-    }
-
-    public void testTwoFunctionsGrey() {
-        doTest();
-    }
-    
-    public void testDeprecated() {
-        doTest();
-    }
-
+public abstract class AbstractFunctionParameterInfoTest extends LightCodeInsightFixtureTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         myFixture.setTestDataPath(PluginTestCaseBase.getTestDataPathBase() + "/parameterInfo/functionParameterInfo");
     }
 
-    private void doTest() {
-        myFixture.configureByFile(getTestName(false) + ".kt");
+    protected void doTest(String fileName) {
+        myFixture.configureByFile(fileName);
         JetFile file = (JetFile) myFixture.getFile();
         PsiElement lastChild = file.getLastChild();
         assert lastChild != null;
diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java
new file mode 100644
index 00000000000..458a06ebff6
--- /dev/null
+++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.parameterInfo;
+
+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;
+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/parameterInfo/functionParameterInfo")
+public class FunctionParameterInfoTestGenerated extends AbstractFunctionParameterInfoTest {
+    public void testAllFilesPresentInFunctionParameterInfo() throws Exception {
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo/functionParameterInfo"), Pattern.compile("^(.+)\\.kt$"), true);
+    }
+    
+    @TestMetadata("Deprecated.kt")
+    public void testDeprecated() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/Deprecated.kt");
+    }
+    
+    @TestMetadata("InheritedFunctions.kt")
+    public void testInheritedFunctions() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt");
+    }
+    
+    @TestMetadata("InheritedWithCurrentFunctions.kt")
+    public void testInheritedWithCurrentFunctions() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt");
+    }
+    
+    @TestMetadata("NamedAndDefaultParameter.kt")
+    public void testNamedAndDefaultParameter() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt");
+    }
+    
+    @TestMetadata("NamedParameter.kt")
+    public void testNamedParameter() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt");
+    }
+    
+    @TestMetadata("NamedParameter2.kt")
+    public void testNamedParameter2() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt");
+    }
+    
+    @TestMetadata("NotGreen.kt")
+    public void testNotGreen() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt");
+    }
+    
+    @TestMetadata("NullableTypeCall.kt")
+    public void testNullableTypeCall() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt");
+    }
+    
+    @TestMetadata("Println.kt")
+    public void testPrintln() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/Println.kt");
+    }
+    
+    @TestMetadata("Simple.kt")
+    public void testSimple() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/Simple.kt");
+    }
+    
+    @TestMetadata("SimpleConstructor.kt")
+    public void testSimpleConstructor() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt");
+    }
+    
+    @TestMetadata("SuperConstructorCall.kt")
+    public void testSuperConstructorCall() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt");
+    }
+    
+    @TestMetadata("TwoFunctions.kt")
+    public void testTwoFunctions() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt");
+    }
+    
+    @TestMetadata("TwoFunctionsGrey.kt")
+    public void testTwoFunctionsGrey() throws Exception {
+        doTest("idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt");
+    }
+    
+}