diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 0de0e8edfbe..938e94b3d5a 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -634,7 +634,7 @@ fun main(args: Array<String>) {
         }
 
         testClass(javaClass<AbstractOptimizeImportsTest>()) {
-            model("editor/optimizeImports", extension = null, recursive = false)
+            model("editor/optimizeImports", pattern = """^([^\.]+)\.kt$""")
         }
 
         testClass(javaClass<AbstractJetPositionManagerTest>()) {
diff --git a/idea/testData/editor/optimizeImports/AlreadyOptimized/AlreadyOptimized.kt b/idea/testData/editor/optimizeImports/AlreadyOptimized.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/AlreadyOptimized/AlreadyOptimized.kt
rename to idea/testData/editor/optimizeImports/AlreadyOptimized.kt
diff --git a/idea/testData/editor/optimizeImports/AlreadyOptimized/AlreadyOptimized.after.kt b/idea/testData/editor/optimizeImports/AlreadyOptimized.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/AlreadyOptimized/AlreadyOptimized.after.kt
rename to idea/testData/editor/optimizeImports/AlreadyOptimized.kt.after
diff --git a/idea/testData/editor/optimizeImports/ArrayAccessExpression/myClass.kt b/idea/testData/editor/optimizeImports/ArrayAccessExpression.dependency.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/ArrayAccessExpression/myClass.kt
rename to idea/testData/editor/optimizeImports/ArrayAccessExpression.dependency.kt
diff --git a/idea/testData/editor/optimizeImports/ArrayAccessExpression/ArrayAccessExpression.kt b/idea/testData/editor/optimizeImports/ArrayAccessExpression.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/ArrayAccessExpression/ArrayAccessExpression.kt
rename to idea/testData/editor/optimizeImports/ArrayAccessExpression.kt
diff --git a/idea/testData/editor/optimizeImports/ArrayAccessExpression/ArrayAccessExpression.after.kt b/idea/testData/editor/optimizeImports/ArrayAccessExpression.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/ArrayAccessExpression/ArrayAccessExpression.after.kt
rename to idea/testData/editor/optimizeImports/ArrayAccessExpression.kt.after
diff --git a/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.dependency.kt b/idea/testData/editor/optimizeImports/ClassMemberImported.dependency.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.dependency.kt
rename to idea/testData/editor/optimizeImports/ClassMemberImported.dependency.kt
diff --git a/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.kt b/idea/testData/editor/optimizeImports/ClassMemberImported.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.kt
rename to idea/testData/editor/optimizeImports/ClassMemberImported.kt
diff --git a/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.after.kt b/idea/testData/editor/optimizeImports/ClassMemberImported.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.after.kt
rename to idea/testData/editor/optimizeImports/ClassMemberImported.kt.after
diff --git a/idea/testData/editor/optimizeImports/ComponentFunction/myClass.kt b/idea/testData/editor/optimizeImports/ComponentFunction.dependency.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/ComponentFunction/myClass.kt
rename to idea/testData/editor/optimizeImports/ComponentFunction.dependency.kt
diff --git a/idea/testData/editor/optimizeImports/ComponentFunction/ComponentFunction.kt b/idea/testData/editor/optimizeImports/ComponentFunction.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/ComponentFunction/ComponentFunction.kt
rename to idea/testData/editor/optimizeImports/ComponentFunction.kt
diff --git a/idea/testData/editor/optimizeImports/ComponentFunction/ComponentFunction.after.kt b/idea/testData/editor/optimizeImports/ComponentFunction.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/ComponentFunction/ComponentFunction.after.kt
rename to idea/testData/editor/optimizeImports/ComponentFunction.kt.after
diff --git a/idea/testData/editor/optimizeImports/CurrentPackage/CurrentPackage.dependency.kt b/idea/testData/editor/optimizeImports/CurrentPackage.dependency.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/CurrentPackage/CurrentPackage.dependency.kt
rename to idea/testData/editor/optimizeImports/CurrentPackage.dependency.kt
diff --git a/idea/testData/editor/optimizeImports/CurrentPackage/CurrentPackage.kt b/idea/testData/editor/optimizeImports/CurrentPackage.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/CurrentPackage/CurrentPackage.kt
rename to idea/testData/editor/optimizeImports/CurrentPackage.kt
diff --git a/idea/testData/editor/optimizeImports/CurrentPackage/CurrentPackage.after.kt b/idea/testData/editor/optimizeImports/CurrentPackage.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/CurrentPackage/CurrentPackage.after.kt
rename to idea/testData/editor/optimizeImports/CurrentPackage.kt.after
diff --git a/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.kt b/idea/testData/editor/optimizeImports/DefaultJsImports.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.kt
rename to idea/testData/editor/optimizeImports/DefaultJsImports.kt
diff --git a/idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.after.kt b/idea/testData/editor/optimizeImports/DefaultJsImports.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/DefaultJsImports/DefaultJsImports.after.kt
rename to idea/testData/editor/optimizeImports/DefaultJsImports.kt.after
diff --git a/idea/testData/editor/optimizeImports/DuplicatedImports/DuplicatedImports.kt b/idea/testData/editor/optimizeImports/DuplicatedImports.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/DuplicatedImports/DuplicatedImports.kt
rename to idea/testData/editor/optimizeImports/DuplicatedImports.kt
diff --git a/idea/testData/editor/optimizeImports/DuplicatedImports/DuplicatedImports.after.kt b/idea/testData/editor/optimizeImports/DuplicatedImports.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/DuplicatedImports/DuplicatedImports.after.kt
rename to idea/testData/editor/optimizeImports/DuplicatedImports.kt.after
diff --git a/idea/testData/editor/optimizeImports/Enums/Enums.dependency.kt b/idea/testData/editor/optimizeImports/Enums.dependency.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/Enums/Enums.dependency.kt
rename to idea/testData/editor/optimizeImports/Enums.dependency.kt
diff --git a/idea/testData/editor/optimizeImports/Enums/Enums.kt b/idea/testData/editor/optimizeImports/Enums.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/Enums/Enums.kt
rename to idea/testData/editor/optimizeImports/Enums.kt
diff --git a/idea/testData/editor/optimizeImports/Enums/Enums.after.kt b/idea/testData/editor/optimizeImports/Enums.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/Enums/Enums.after.kt
rename to idea/testData/editor/optimizeImports/Enums.kt.after
diff --git a/idea/testData/editor/optimizeImports/InvokeFunction/myClass.kt b/idea/testData/editor/optimizeImports/InvokeFunction.dependency.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/InvokeFunction/myClass.kt
rename to idea/testData/editor/optimizeImports/InvokeFunction.dependency.kt
diff --git a/idea/testData/editor/optimizeImports/InvokeFunction/InvokeFunction.kt b/idea/testData/editor/optimizeImports/InvokeFunction.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/InvokeFunction/InvokeFunction.kt
rename to idea/testData/editor/optimizeImports/InvokeFunction.kt
diff --git a/idea/testData/editor/optimizeImports/InvokeFunction/InvokeFunction.after.kt b/idea/testData/editor/optimizeImports/InvokeFunction.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/InvokeFunction/InvokeFunction.after.kt
rename to idea/testData/editor/optimizeImports/InvokeFunction.kt.after
diff --git a/idea/testData/editor/optimizeImports/IteratorFunction/myClass.kt b/idea/testData/editor/optimizeImports/IteratorFunction.dependency.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/IteratorFunction/myClass.kt
rename to idea/testData/editor/optimizeImports/IteratorFunction.dependency.kt
diff --git a/idea/testData/editor/optimizeImports/IteratorFunction/IteratorFunction.kt b/idea/testData/editor/optimizeImports/IteratorFunction.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/IteratorFunction/IteratorFunction.kt
rename to idea/testData/editor/optimizeImports/IteratorFunction.kt
diff --git a/idea/testData/editor/optimizeImports/IteratorFunction/IteratorFunction.after.kt b/idea/testData/editor/optimizeImports/IteratorFunction.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/IteratorFunction/IteratorFunction.after.kt
rename to idea/testData/editor/optimizeImports/IteratorFunction.kt.after
diff --git a/idea/testData/editor/optimizeImports/JavaStaticField/MyJavaClass.java b/idea/testData/editor/optimizeImports/JavaStaticField.dependency.java
similarity index 100%
rename from idea/testData/editor/optimizeImports/JavaStaticField/MyJavaClass.java
rename to idea/testData/editor/optimizeImports/JavaStaticField.dependency.java
diff --git a/idea/testData/editor/optimizeImports/JavaStaticField/JavaStaticField.kt b/idea/testData/editor/optimizeImports/JavaStaticField.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/JavaStaticField/JavaStaticField.kt
rename to idea/testData/editor/optimizeImports/JavaStaticField.kt
diff --git a/idea/testData/editor/optimizeImports/JavaStaticField/JavaStaticField.after.kt b/idea/testData/editor/optimizeImports/JavaStaticField.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/JavaStaticField/JavaStaticField.after.kt
rename to idea/testData/editor/optimizeImports/JavaStaticField.kt.after
diff --git a/idea/testData/editor/optimizeImports/KotlinPackage/kotlinClass.kt b/idea/testData/editor/optimizeImports/KotlinPackage.dependency.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/KotlinPackage/kotlinClass.kt
rename to idea/testData/editor/optimizeImports/KotlinPackage.dependency.kt
diff --git a/idea/testData/editor/optimizeImports/KotlinPackage/KotlinPackage.kt b/idea/testData/editor/optimizeImports/KotlinPackage.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/KotlinPackage/KotlinPackage.kt
rename to idea/testData/editor/optimizeImports/KotlinPackage.kt
diff --git a/idea/testData/editor/optimizeImports/KotlinPackage/KotlinPackage.after.kt b/idea/testData/editor/optimizeImports/KotlinPackage.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/KotlinPackage/KotlinPackage.after.kt
rename to idea/testData/editor/optimizeImports/KotlinPackage.kt.after
diff --git a/idea/testData/editor/optimizeImports/Kt1850FullQualified/Kt1850FullQualified.kt b/idea/testData/editor/optimizeImports/Kt1850FullQualified.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/Kt1850FullQualified/Kt1850FullQualified.kt
rename to idea/testData/editor/optimizeImports/Kt1850FullQualified.kt
diff --git a/idea/testData/editor/optimizeImports/Kt1850FullQualified/Kt1850FullQualified.after.kt b/idea/testData/editor/optimizeImports/Kt1850FullQualified.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/Kt1850FullQualified/Kt1850FullQualified.after.kt
rename to idea/testData/editor/optimizeImports/Kt1850FullQualified.kt.after
diff --git a/idea/testData/editor/optimizeImports/Kt1850InnerClass/Kt1850InnerClass.kt b/idea/testData/editor/optimizeImports/Kt1850InnerClass.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/Kt1850InnerClass/Kt1850InnerClass.kt
rename to idea/testData/editor/optimizeImports/Kt1850InnerClass.kt
diff --git a/idea/testData/editor/optimizeImports/Kt1850InnerClass/Kt1850InnerClass.after.kt b/idea/testData/editor/optimizeImports/Kt1850InnerClass.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/Kt1850InnerClass/Kt1850InnerClass.after.kt
rename to idea/testData/editor/optimizeImports/Kt1850InnerClass.kt.after
diff --git a/idea/testData/editor/optimizeImports/Kt2488EnumEntry/Kt2488EnumEntry.kt b/idea/testData/editor/optimizeImports/Kt2488EnumEntry.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/Kt2488EnumEntry/Kt2488EnumEntry.kt
rename to idea/testData/editor/optimizeImports/Kt2488EnumEntry.kt
diff --git a/idea/testData/editor/optimizeImports/Kt2488EnumEntry/Kt2488EnumEntry.after.kt b/idea/testData/editor/optimizeImports/Kt2488EnumEntry.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/Kt2488EnumEntry/Kt2488EnumEntry.after.kt
rename to idea/testData/editor/optimizeImports/Kt2488EnumEntry.kt.after
diff --git a/idea/testData/editor/optimizeImports/Kt2709/Kt2709.kt b/idea/testData/editor/optimizeImports/Kt2709.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/Kt2709/Kt2709.kt
rename to idea/testData/editor/optimizeImports/Kt2709.kt
diff --git a/idea/testData/editor/optimizeImports/Kt2709/Kt2709.after.kt b/idea/testData/editor/optimizeImports/Kt2709.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/Kt2709/Kt2709.after.kt
rename to idea/testData/editor/optimizeImports/Kt2709.kt.after
diff --git a/idea/testData/editor/optimizeImports/MembersInScope/MembersInScope.kt b/idea/testData/editor/optimizeImports/MembersInScope.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/MembersInScope/MembersInScope.kt
rename to idea/testData/editor/optimizeImports/MembersInScope.kt
diff --git a/idea/testData/editor/optimizeImports/MembersInScope/MembersInScope.after.kt b/idea/testData/editor/optimizeImports/MembersInScope.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/MembersInScope/MembersInScope.after.kt
rename to idea/testData/editor/optimizeImports/MembersInScope.kt.after
diff --git a/idea/testData/editor/optimizeImports/PartiallyQualified/PartiallyQualified.kt b/idea/testData/editor/optimizeImports/PartiallyQualified.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/PartiallyQualified/PartiallyQualified.kt
rename to idea/testData/editor/optimizeImports/PartiallyQualified.kt
diff --git a/idea/testData/editor/optimizeImports/PartiallyQualified/PartiallyQualified.after.kt b/idea/testData/editor/optimizeImports/PartiallyQualified.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/PartiallyQualified/PartiallyQualified.after.kt
rename to idea/testData/editor/optimizeImports/PartiallyQualified.kt.after
diff --git a/idea/testData/editor/optimizeImports/RemoveImportsIfGeneral/RemoveImportsIfGeneral.kt b/idea/testData/editor/optimizeImports/RemoveImportsIfGeneral.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/RemoveImportsIfGeneral/RemoveImportsIfGeneral.kt
rename to idea/testData/editor/optimizeImports/RemoveImportsIfGeneral.kt
diff --git a/idea/testData/editor/optimizeImports/RemoveImportsIfGeneral/RemoveImportsIfGeneral.after.kt b/idea/testData/editor/optimizeImports/RemoveImportsIfGeneral.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/RemoveImportsIfGeneral/RemoveImportsIfGeneral.after.kt
rename to idea/testData/editor/optimizeImports/RemoveImportsIfGeneral.kt.after
diff --git a/idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore/RemoveImportsIfGeneralBefore.kt b/idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore/RemoveImportsIfGeneralBefore.kt
rename to idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore.kt
diff --git a/idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore/RemoveImportsIfGeneralBefore.after.kt b/idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore/RemoveImportsIfGeneralBefore.after.kt
rename to idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore.kt.after
diff --git a/idea/testData/editor/optimizeImports/SamConstructor/SamConstructor.kt b/idea/testData/editor/optimizeImports/SamConstructor.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/SamConstructor/SamConstructor.kt
rename to idea/testData/editor/optimizeImports/SamConstructor.kt
diff --git a/idea/testData/editor/optimizeImports/SamConstructor/SamConstructor.after.kt b/idea/testData/editor/optimizeImports/SamConstructor.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/SamConstructor/SamConstructor.after.kt
rename to idea/testData/editor/optimizeImports/SamConstructor.kt.after
diff --git a/idea/testData/editor/optimizeImports/UnusedImports/UnusedImports.kt b/idea/testData/editor/optimizeImports/UnusedImports.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/UnusedImports/UnusedImports.kt
rename to idea/testData/editor/optimizeImports/UnusedImports.kt
diff --git a/idea/testData/editor/optimizeImports/UnusedImports/UnusedImports.after.kt b/idea/testData/editor/optimizeImports/UnusedImports.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/UnusedImports/UnusedImports.after.kt
rename to idea/testData/editor/optimizeImports/UnusedImports.kt.after
diff --git a/idea/testData/editor/optimizeImports/WithAliases/WithAliases.kt b/idea/testData/editor/optimizeImports/WithAliases.kt
similarity index 100%
rename from idea/testData/editor/optimizeImports/WithAliases/WithAliases.kt
rename to idea/testData/editor/optimizeImports/WithAliases.kt
diff --git a/idea/testData/editor/optimizeImports/WithAliases/WithAliases.after.kt b/idea/testData/editor/optimizeImports/WithAliases.kt.after
similarity index 100%
rename from idea/testData/editor/optimizeImports/WithAliases/WithAliases.after.kt
rename to idea/testData/editor/optimizeImports/WithAliases.kt.after
diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt
index fb158dc42fa..4db2bb50ed2 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt
@@ -18,43 +18,17 @@ package org.jetbrains.kotlin.idea.imports
 
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.command.UndoConfirmationPolicy
-import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase
 import java.io.File
 import org.junit.Assert
 import org.jetbrains.kotlin.idea.PluginTestCaseBase
+import org.jetbrains.kotlin.*
+import org.jetbrains.kotlin.psi.*
 
-public abstract class AbstractOptimizeImportsTest() : JetLightCodeInsightFixtureTestCase() {
-
-    public fun doTest(path: String) {
-        val fixture = myFixture!!
-        fixture.setTestDataPath(path)
-        val (expectedFile, testFiles) = findTestFiles(path)
-        fixture.configureByFiles(*testFiles.map { it.name : String? }.copyToArray())
-        CommandProcessor.getInstance()!!.executeCommand(
-                getProject(),
-                KotlinImportOptimizer().processFile(fixture.getFile()),
-                "Optimize Imports",
-                null,
-                UndoConfirmationPolicy.DO_NOT_REQUEST_CONFIRMATION
-        )
-        fixture.checkResultByFile(expectedFile.name, true)
+public abstract class AbstractOptimizeImportsTest() : AbstractImportsTest() {
+    override fun doTest(file: JetFile) {
+        KotlinImportOptimizer().processFile(file).run()
     }
 
-    private fun findTestFiles(path: String): Pair<File, List<File>> {
-        val files = File(path).listFiles()!!
-        val testName = getTestName(false)
-
-        val expectedFileName = "$testName.after.kt"
-        val expectedFile = files.find { it.name == expectedFileName }
-        Assert.assertNotNull("Can't find $expectedFileName", expectedFile)
-
-        val fileToBeOptimizedName = "$testName.kt"
-        val fileToBeOptimized = files.find { it.name == fileToBeOptimizedName }
-        Assert.assertNotNull("Can't find $fileToBeOptimizedName", fileToBeOptimized)
-
-        val testFiles = listOf(fileToBeOptimized!!) + files.filter { it != fileToBeOptimized && it != expectedFile }
-        return Pair(expectedFile!!, testFiles)
-    }
-
-    override fun getTestDataPath() = "${PluginTestCaseBase.getTestDataPathBase()}/editor/optimizeImports/${getTestName(false)}"
+    override val preferAllUnderImportsDefault: Boolean
+        get() = false
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
index 8e71fff971c..8803dda3c58 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
@@ -32,144 +32,144 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
     public void testAllFilesPresentInOptimizeImports() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/optimizeImports"), Pattern.compile("^([^\\.]+)$"), false);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/optimizeImports"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
     }
 
-    @TestMetadata("AlreadyOptimized")
+    @TestMetadata("AlreadyOptimized.kt")
     public void testAlreadyOptimized() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/AlreadyOptimized/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/AlreadyOptimized.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("ArrayAccessExpression")
+    @TestMetadata("ArrayAccessExpression.kt")
     public void testArrayAccessExpression() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ArrayAccessExpression/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ArrayAccessExpression.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("ClassMemberImported")
+    @TestMetadata("ClassMemberImported.kt")
     public void testClassMemberImported() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ClassMemberImported/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ClassMemberImported.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("ComponentFunction")
+    @TestMetadata("ComponentFunction.kt")
     public void testComponentFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ComponentFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ComponentFunction.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("CurrentPackage")
+    @TestMetadata("CurrentPackage.kt")
     public void testCurrentPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/CurrentPackage/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/CurrentPackage.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("DefaultJsImports")
+    @TestMetadata("DefaultJsImports.kt")
     public void testDefaultJsImports() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DefaultJsImports/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DefaultJsImports.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("DuplicatedImports")
+    @TestMetadata("DuplicatedImports.kt")
     public void testDuplicatedImports() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DuplicatedImports/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DuplicatedImports.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("Enums")
+    @TestMetadata("Enums.kt")
     public void testEnums() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Enums/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Enums.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("InvokeFunction")
+    @TestMetadata("InvokeFunction.kt")
     public void testInvokeFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/InvokeFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/InvokeFunction.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("IteratorFunction")
+    @TestMetadata("IteratorFunction.kt")
     public void testIteratorFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/IteratorFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/IteratorFunction.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("JavaStaticField")
+    @TestMetadata("JavaStaticField.kt")
     public void testJavaStaticField() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/JavaStaticField/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/JavaStaticField.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("KotlinPackage")
+    @TestMetadata("KotlinPackage.kt")
     public void testKotlinPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KotlinPackage/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KotlinPackage.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("Kt1850FullQualified")
+    @TestMetadata("Kt1850FullQualified.kt")
     public void testKt1850FullQualified() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850FullQualified/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850FullQualified.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("Kt1850InnerClass")
+    @TestMetadata("Kt1850InnerClass.kt")
     public void testKt1850InnerClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850InnerClass/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850InnerClass.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("Kt2488EnumEntry")
+    @TestMetadata("Kt2488EnumEntry.kt")
     public void testKt2488EnumEntry() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2488EnumEntry/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2488EnumEntry.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("Kt2709")
+    @TestMetadata("Kt2709.kt")
     public void testKt2709() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2709/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2709.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("MembersInScope")
+    @TestMetadata("MembersInScope.kt")
     public void testMembersInScope() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/MembersInScope/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/MembersInScope.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("PartiallyQualified")
+    @TestMetadata("PartiallyQualified.kt")
     public void testPartiallyQualified() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/PartiallyQualified/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/PartiallyQualified.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("RemoveImportsIfGeneral")
+    @TestMetadata("RemoveImportsIfGeneral.kt")
     public void testRemoveImportsIfGeneral() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneral/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneral.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("RemoveImportsIfGeneralBefore")
+    @TestMetadata("RemoveImportsIfGeneralBefore.kt")
     public void testRemoveImportsIfGeneralBefore() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("SamConstructor")
+    @TestMetadata("SamConstructor.kt")
     public void testSamConstructor() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/SamConstructor/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/SamConstructor.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("UnusedImports")
+    @TestMetadata("UnusedImports.kt")
     public void testUnusedImports() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/UnusedImports/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/UnusedImports.kt");
         doTest(fileName);
     }
 
-    @TestMetadata("WithAliases")
+    @TestMetadata("WithAliases.kt")
     public void testWithAliases() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/WithAliases/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/WithAliases.kt");
         doTest(fileName);
     }
 }