diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index e688eb1ea87..f68a300b4e0 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -675,7 +675,6 @@ fun main(args: Array<String>) {
 
         testClass<AbstractMultiplatformAnalysisTest> {
             model("multiplatform", recursive = false, extension = null)
-            model("multiplatformTypeRefinement", recursive = false, extension = null)
         }
 
         testClass<AbstractQuickFixMultiModuleTest> {
diff --git a/idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/common/common.kt b/idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/common/common.kt
rename to idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/commonLibrary/lib.kt b/idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/commonLibrary/lib.kt
rename to idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt
diff --git a/idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/dependencies.txt b/idea/testData/multiplatform/aliasesTypeMismatch/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/dependencies.txt
rename to idea/testData/multiplatform/aliasesTypeMismatch/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/jvm/jvm.kt b/idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/jvm/jvm.kt
rename to idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/jvmLibrary/bindings.kt b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/jvmLibrary/bindings.kt
rename to idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt
diff --git a/idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/jvmLibrary/core.kt b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/jvmLibrary/core.kt
rename to idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt
diff --git a/idea/testData/multiplatformTypeRefinement/callableReferences/common-1-main/common-1-main.kt b/idea/testData/multiplatform/callableReferences/common-1-main/common-1-main.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/callableReferences/common-1-main/common-1-main.kt
rename to idea/testData/multiplatform/callableReferences/common-1-main/common-1-main.kt
diff --git a/idea/testData/multiplatformTypeRefinement/callableReferences/common-1/common-1.kt b/idea/testData/multiplatform/callableReferences/common-1/common-1.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/callableReferences/common-1/common-1.kt
rename to idea/testData/multiplatform/callableReferences/common-1/common-1.kt
diff --git a/idea/testData/multiplatformTypeRefinement/callableReferences/common-2-main/common-2-main.kt b/idea/testData/multiplatform/callableReferences/common-2-main/common-2-main.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/callableReferences/common-2-main/common-2-main.kt
rename to idea/testData/multiplatform/callableReferences/common-2-main/common-2-main.kt
diff --git a/idea/testData/multiplatformTypeRefinement/callableReferences/common-2/common-2.kt b/idea/testData/multiplatform/callableReferences/common-2/common-2.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/callableReferences/common-2/common-2.kt
rename to idea/testData/multiplatform/callableReferences/common-2/common-2.kt
diff --git a/idea/testData/multiplatformTypeRefinement/callableReferences/dependencies.txt b/idea/testData/multiplatform/callableReferences/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/callableReferences/dependencies.txt
rename to idea/testData/multiplatform/callableReferences/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/callableReferences/graph.txt b/idea/testData/multiplatform/callableReferences/graph.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/callableReferences/graph.txt
rename to idea/testData/multiplatform/callableReferences/graph.txt
diff --git a/idea/testData/multiplatformTypeRefinement/callableReferences/jvm-main/jvm-main.kt b/idea/testData/multiplatform/callableReferences/jvm-main/jvm-main.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/callableReferences/jvm-main/jvm-main.kt
rename to idea/testData/multiplatform/callableReferences/jvm-main/jvm-main.kt
diff --git a/idea/testData/multiplatformTypeRefinement/callableReferences/jvm/jvm.kt b/idea/testData/multiplatform/callableReferences/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/callableReferences/jvm/jvm.kt
rename to idea/testData/multiplatform/callableReferences/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/constructorsOfExpect/common/common.kt b/idea/testData/multiplatform/constructorsOfExpect/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/constructorsOfExpect/common/common.kt
rename to idea/testData/multiplatform/constructorsOfExpect/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/constructorsOfExpect/dependencies.txt b/idea/testData/multiplatform/constructorsOfExpect/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/constructorsOfExpect/dependencies.txt
rename to idea/testData/multiplatform/constructorsOfExpect/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/constructorsOfExpect/jvm/jvm.kt b/idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/constructorsOfExpect/jvm/jvm.kt
rename to idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/common-1/common-1.kt b/idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/common-1/common-1.kt
rename to idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/common-2-1/common-2-1.kt b/idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/common-2-1/common-2-1.kt
rename to idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/common-2-2/common-2-2.kt b/idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/common-2-2/common-2-2.kt
rename to idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/dependencies.txt b/idea/testData/multiplatform/diamondModuleDependency1/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/dependencies.txt
rename to idea/testData/multiplatform/diamondModuleDependency1/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/graph.txt b/idea/testData/multiplatform/diamondModuleDependency1/graph.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/graph.txt
rename to idea/testData/multiplatform/diamondModuleDependency1/graph.txt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/jvm/jvm.kt b/idea/testData/multiplatform/diamondModuleDependency1/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/jvm/jvm.kt
rename to idea/testData/multiplatform/diamondModuleDependency1/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/common-1/common-1.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/common-1/common-1.kt
rename to idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/common-2-1/common-2-1.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/common-2-1/common-2-1.kt
rename to idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/common-2-2/common-2-2.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/common-2-2/common-2-2.kt
rename to idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/common-2-3/common-2-3.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/common-2-3/common-2-3.kt
rename to idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/dependencies.txt b/idea/testData/multiplatform/diamondModuleDependency2/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/dependencies.txt
rename to idea/testData/multiplatform/diamondModuleDependency2/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/graph.txt b/idea/testData/multiplatform/diamondModuleDependency2/graph.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/graph.txt
rename to idea/testData/multiplatform/diamondModuleDependency2/graph.txt
diff --git a/idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/jvm/jvm.kt b/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/jvm/jvm.kt
rename to idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/extensionOnExpect/common/common.kt b/idea/testData/multiplatform/extensionOnExpect/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/extensionOnExpect/common/common.kt
rename to idea/testData/multiplatform/extensionOnExpect/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/extensionOnExpect/dependencies.txt b/idea/testData/multiplatform/extensionOnExpect/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/extensionOnExpect/dependencies.txt
rename to idea/testData/multiplatform/extensionOnExpect/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/extensionOnExpect/jvm/jvm.kt b/idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/extensionOnExpect/jvm/jvm.kt
rename to idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/extensionOnExpect/main/main.kt b/idea/testData/multiplatform/extensionOnExpect/main/main.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/extensionOnExpect/main/main.kt
rename to idea/testData/multiplatform/extensionOnExpect/main/main.kt
diff --git a/idea/testData/multiplatformTypeRefinement/jsNameClash/common/common.kt b/idea/testData/multiplatform/jsNameClash/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/jsNameClash/common/common.kt
rename to idea/testData/multiplatform/jsNameClash/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/jsNameClash/dependencies.txt b/idea/testData/multiplatform/jsNameClash/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/jsNameClash/dependencies.txt
rename to idea/testData/multiplatform/jsNameClash/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/jsNameClash/js/js.kt b/idea/testData/multiplatform/jsNameClash/js/js.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/jsNameClash/js/js.kt
rename to idea/testData/multiplatform/jsNameClash/js/js.kt
diff --git a/idea/testData/multiplatformTypeRefinement/lambdas/common/common.kt b/idea/testData/multiplatform/lambdas/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/lambdas/common/common.kt
rename to idea/testData/multiplatform/lambdas/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/lambdas/dependencies.txt b/idea/testData/multiplatform/lambdas/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/lambdas/dependencies.txt
rename to idea/testData/multiplatform/lambdas/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/lambdas/jvm/jvm.kt b/idea/testData/multiplatform/lambdas/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/lambdas/jvm/jvm.kt
rename to idea/testData/multiplatform/lambdas/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/languageConstructions/common/common.kt b/idea/testData/multiplatform/languageConstructions/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/languageConstructions/common/common.kt
rename to idea/testData/multiplatform/languageConstructions/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/languageConstructions/dependencies.txt b/idea/testData/multiplatform/languageConstructions/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/languageConstructions/dependencies.txt
rename to idea/testData/multiplatform/languageConstructions/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/languageConstructions/jvm/jvm.kt b/idea/testData/multiplatform/languageConstructions/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/languageConstructions/jvm/jvm.kt
rename to idea/testData/multiplatform/languageConstructions/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/languageConstructions/main/main.kt b/idea/testData/multiplatform/languageConstructions/main/main.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/languageConstructions/main/main.kt
rename to idea/testData/multiplatform/languageConstructions/main/main.kt
diff --git a/idea/testData/multiplatformTypeRefinement/multilevelParents/common-1/common-1.kt b/idea/testData/multiplatform/multilevelParents/common-1/common-1.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/multilevelParents/common-1/common-1.kt
rename to idea/testData/multiplatform/multilevelParents/common-1/common-1.kt
diff --git a/idea/testData/multiplatformTypeRefinement/multilevelParents/common-2/common-2.kt b/idea/testData/multiplatform/multilevelParents/common-2/common-2.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/multilevelParents/common-2/common-2.kt
rename to idea/testData/multiplatform/multilevelParents/common-2/common-2.kt
diff --git a/idea/testData/multiplatformTypeRefinement/multilevelParents/dependencies.txt b/idea/testData/multiplatform/multilevelParents/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/multilevelParents/dependencies.txt
rename to idea/testData/multiplatform/multilevelParents/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/multilevelParents/graph.txt b/idea/testData/multiplatform/multilevelParents/graph.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/multilevelParents/graph.txt
rename to idea/testData/multiplatform/multilevelParents/graph.txt
diff --git a/idea/testData/multiplatformTypeRefinement/multilevelParents/jvm/jvm.kt b/idea/testData/multiplatform/multilevelParents/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/multilevelParents/jvm/jvm.kt
rename to idea/testData/multiplatform/multilevelParents/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/qualifiedReceiver/common/common.kt b/idea/testData/multiplatform/qualifiedReceiver/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/qualifiedReceiver/common/common.kt
rename to idea/testData/multiplatform/qualifiedReceiver/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/qualifiedReceiver/dependencies.txt b/idea/testData/multiplatform/qualifiedReceiver/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/qualifiedReceiver/dependencies.txt
rename to idea/testData/multiplatform/qualifiedReceiver/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/qualifiedReceiver/jvm/platform.kt b/idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/qualifiedReceiver/jvm/platform.kt
rename to idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt
diff --git a/idea/testData/multiplatformTypeRefinement/qualifiedReceiver/main/main.kt b/idea/testData/multiplatform/qualifiedReceiver/main/main.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/qualifiedReceiver/main/main.kt
rename to idea/testData/multiplatform/qualifiedReceiver/main/main.kt
diff --git a/idea/testData/multiplatformTypeRefinement/recursiveTypes/common/common.kt b/idea/testData/multiplatform/recursiveTypes/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/recursiveTypes/common/common.kt
rename to idea/testData/multiplatform/recursiveTypes/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/recursiveTypes/dependencies.txt b/idea/testData/multiplatform/recursiveTypes/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/recursiveTypes/dependencies.txt
rename to idea/testData/multiplatform/recursiveTypes/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/recursiveTypes/jvm/jvm.kt b/idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/recursiveTypes/jvm/jvm.kt
rename to idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/simple/d1/d1.kt b/idea/testData/multiplatform/simple/d1/d1.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/simple/d1/d1.kt
rename to idea/testData/multiplatform/simple/d1/d1.kt
diff --git a/idea/testData/multiplatformTypeRefinement/simple/d2/d2.kt b/idea/testData/multiplatform/simple/d2/d2.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/simple/d2/d2.kt
rename to idea/testData/multiplatform/simple/d2/d2.kt
diff --git a/idea/testData/multiplatformTypeRefinement/simple/d3/d3.kt b/idea/testData/multiplatform/simple/d3/d3.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/simple/d3/d3.kt
rename to idea/testData/multiplatform/simple/d3/d3.kt
diff --git a/idea/testData/multiplatformTypeRefinement/simple/d4/d4.kt b/idea/testData/multiplatform/simple/d4/d4.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/simple/d4/d4.kt
rename to idea/testData/multiplatform/simple/d4/d4.kt
diff --git a/idea/testData/multiplatformTypeRefinement/simple/dependencies.txt b/idea/testData/multiplatform/simple/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/simple/dependencies.txt
rename to idea/testData/multiplatform/simple/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/supertypes/d0/d0.kt b/idea/testData/multiplatform/supertypes/d0/d0.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/supertypes/d0/d0.kt
rename to idea/testData/multiplatform/supertypes/d0/d0.kt
diff --git a/idea/testData/multiplatformTypeRefinement/supertypes/d1/d1.kt b/idea/testData/multiplatform/supertypes/d1/d1.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/supertypes/d1/d1.kt
rename to idea/testData/multiplatform/supertypes/d1/d1.kt
diff --git a/idea/testData/multiplatformTypeRefinement/supertypes/d2/d2.kt b/idea/testData/multiplatform/supertypes/d2/d2.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/supertypes/d2/d2.kt
rename to idea/testData/multiplatform/supertypes/d2/d2.kt
diff --git a/idea/testData/multiplatformTypeRefinement/supertypes/d3/d3.kt b/idea/testData/multiplatform/supertypes/d3/d3.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/supertypes/d3/d3.kt
rename to idea/testData/multiplatform/supertypes/d3/d3.kt
diff --git a/idea/testData/multiplatformTypeRefinement/supertypes/d4/d4.kt b/idea/testData/multiplatform/supertypes/d4/d4.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/supertypes/d4/d4.kt
rename to idea/testData/multiplatform/supertypes/d4/d4.kt
diff --git a/idea/testData/multiplatformTypeRefinement/supertypes/dependencies.txt b/idea/testData/multiplatform/supertypes/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/supertypes/dependencies.txt
rename to idea/testData/multiplatform/supertypes/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/typeAliasToExpectClassExplicitReference/common/common.kt b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeAliasToExpectClassExplicitReference/common/common.kt
rename to idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/typeAliasToExpectClassExplicitReference/dependencies.txt b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeAliasToExpectClassExplicitReference/dependencies.txt
rename to idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/typeAliasToExpectClassExplicitReference/jvm/jvm.kt b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeAliasToExpectClassExplicitReference/jvm/jvm.kt
rename to idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt
diff --git a/idea/testData/multiplatformTypeRefinement/typeAliases/common/aliases.kt b/idea/testData/multiplatform/typeAliases/common/aliases.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeAliases/common/aliases.kt
rename to idea/testData/multiplatform/typeAliases/common/aliases.kt
diff --git a/idea/testData/multiplatformTypeRefinement/typeAliases/dependencies.txt b/idea/testData/multiplatform/typeAliases/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeAliases/dependencies.txt
rename to idea/testData/multiplatform/typeAliases/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/typeAliases/jvm/aliases.kt b/idea/testData/multiplatform/typeAliases/jvm/aliases.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeAliases/jvm/aliases.kt
rename to idea/testData/multiplatform/typeAliases/jvm/aliases.kt
diff --git a/idea/testData/multiplatformTypeRefinement/typeAliases/main/main.kt b/idea/testData/multiplatform/typeAliases/main/main.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeAliases/main/main.kt
rename to idea/testData/multiplatform/typeAliases/main/main.kt
diff --git a/idea/testData/multiplatformTypeRefinement/typeParameters/common/common.kt b/idea/testData/multiplatform/typeParameters/common/common.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeParameters/common/common.kt
rename to idea/testData/multiplatform/typeParameters/common/common.kt
diff --git a/idea/testData/multiplatformTypeRefinement/typeParameters/dependencies.txt b/idea/testData/multiplatform/typeParameters/dependencies.txt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeParameters/dependencies.txt
rename to idea/testData/multiplatform/typeParameters/dependencies.txt
diff --git a/idea/testData/multiplatformTypeRefinement/typeParameters/jvm/platform.kt b/idea/testData/multiplatform/typeParameters/jvm/platform.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeParameters/jvm/platform.kt
rename to idea/testData/multiplatform/typeParameters/jvm/platform.kt
diff --git a/idea/testData/multiplatformTypeRefinement/typeParameters/main/main.kt b/idea/testData/multiplatform/typeParameters/main/main.kt
similarity index 100%
rename from idea/testData/multiplatformTypeRefinement/typeParameters/main/main.kt
rename to idea/testData/multiplatform/typeParameters/main/main.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java
index 793deb4bde8..8820a9d2bad 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java
@@ -17,136 +17,120 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
+@TestMetadata("idea/testData/multiplatform")
+@TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAnalysisTest {
-    @TestMetadata("idea/testData/multiplatform")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Multiplatform extends AbstractMultiplatformAnalysisTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInMultiplatform() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiplatform"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
-        }
-
-        @TestMetadata("internalFromDependsOn")
-        public void testInternalFromDependsOn() throws Exception {
-            runTest("idea/testData/multiplatform/internalFromDependsOn/");
-        }
-
-        @TestMetadata("internalFromDependsOnOfProduction")
-        public void testInternalFromDependsOnOfProduction() throws Exception {
-            runTest("idea/testData/multiplatform/internalFromDependsOnOfProduction/");
-        }
-
-        @TestMetadata("internalFromProduction")
-        public void testInternalFromProduction() throws Exception {
-            runTest("idea/testData/multiplatform/internalFromProduction/");
-        }
-
-        @TestMetadata("useCorrectBuiltIns")
-        public void testUseCorrectBuiltIns() throws Exception {
-            runTest("idea/testData/multiplatform/useCorrectBuiltIns/");
-        }
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
     }
 
-    @TestMetadata("idea/testData/multiplatformTypeRefinement")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class MultiplatformTypeRefinement extends AbstractMultiplatformAnalysisTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
-        }
+    @TestMetadata("aliasesTypeMismatch")
+    public void testAliasesTypeMismatch() throws Exception {
+        runTest("idea/testData/multiplatform/aliasesTypeMismatch/");
+    }
 
-        @TestMetadata("aliasesTypeMismatch")
-        public void testAliasesTypeMismatch() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/aliasesTypeMismatch/");
-        }
+    public void testAllFilesPresentInMultiplatform() throws Exception {
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiplatform"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
+    }
 
-        public void testAllFilesPresentInMultiplatformTypeRefinement() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiplatformTypeRefinement"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false);
-        }
+    @TestMetadata("callableReferences")
+    public void testCallableReferences() throws Exception {
+        runTest("idea/testData/multiplatform/callableReferences/");
+    }
 
-        @TestMetadata("callableReferences")
-        public void testCallableReferences() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/callableReferences/");
-        }
+    @TestMetadata("constructorsOfExpect")
+    public void testConstructorsOfExpect() throws Exception {
+        runTest("idea/testData/multiplatform/constructorsOfExpect/");
+    }
 
-        @TestMetadata("constructorsOfExpect")
-        public void testConstructorsOfExpect() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/constructorsOfExpect/");
-        }
+    @TestMetadata("diamondModuleDependency1")
+    public void testDiamondModuleDependency1() throws Exception {
+        runTest("idea/testData/multiplatform/diamondModuleDependency1/");
+    }
 
-        @TestMetadata("diamondModuleDependency1")
-        public void testDiamondModuleDependency1() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/diamondModuleDependency1/");
-        }
+    @TestMetadata("diamondModuleDependency2")
+    public void testDiamondModuleDependency2() throws Exception {
+        runTest("idea/testData/multiplatform/diamondModuleDependency2/");
+    }
 
-        @TestMetadata("diamondModuleDependency2")
-        public void testDiamondModuleDependency2() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/diamondModuleDependency2/");
-        }
+    @TestMetadata("extensionOnExpect")
+    public void testExtensionOnExpect() throws Exception {
+        runTest("idea/testData/multiplatform/extensionOnExpect/");
+    }
 
-        @TestMetadata("extensionOnExpect")
-        public void testExtensionOnExpect() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/extensionOnExpect/");
-        }
+    @TestMetadata("internalFromDependsOn")
+    public void testInternalFromDependsOn() throws Exception {
+        runTest("idea/testData/multiplatform/internalFromDependsOn/");
+    }
 
-        @TestMetadata("jsNameClash")
-        public void testJsNameClash() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/jsNameClash/");
-        }
+    @TestMetadata("internalFromDependsOnOfProduction")
+    public void testInternalFromDependsOnOfProduction() throws Exception {
+        runTest("idea/testData/multiplatform/internalFromDependsOnOfProduction/");
+    }
 
-        @TestMetadata("lambdas")
-        public void testLambdas() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/lambdas/");
-        }
+    @TestMetadata("internalFromProduction")
+    public void testInternalFromProduction() throws Exception {
+        runTest("idea/testData/multiplatform/internalFromProduction/");
+    }
 
-        @TestMetadata("languageConstructions")
-        public void testLanguageConstructions() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/languageConstructions/");
-        }
+    @TestMetadata("jsNameClash")
+    public void testJsNameClash() throws Exception {
+        runTest("idea/testData/multiplatform/jsNameClash/");
+    }
 
-        @TestMetadata("multilevelParents")
-        public void testMultilevelParents() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/multilevelParents/");
-        }
+    @TestMetadata("lambdas")
+    public void testLambdas() throws Exception {
+        runTest("idea/testData/multiplatform/lambdas/");
+    }
 
-        @TestMetadata("qualifiedReceiver")
-        public void testQualifiedReceiver() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/qualifiedReceiver/");
-        }
+    @TestMetadata("languageConstructions")
+    public void testLanguageConstructions() throws Exception {
+        runTest("idea/testData/multiplatform/languageConstructions/");
+    }
 
-        @TestMetadata("recursiveTypes")
-        public void testRecursiveTypes() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/recursiveTypes/");
-        }
+    @TestMetadata("multilevelParents")
+    public void testMultilevelParents() throws Exception {
+        runTest("idea/testData/multiplatform/multilevelParents/");
+    }
 
-        @TestMetadata("simple")
-        public void testSimple() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/simple/");
-        }
+    @TestMetadata("qualifiedReceiver")
+    public void testQualifiedReceiver() throws Exception {
+        runTest("idea/testData/multiplatform/qualifiedReceiver/");
+    }
 
-        @TestMetadata("supertypes")
-        public void testSupertypes() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/supertypes/");
-        }
+    @TestMetadata("recursiveTypes")
+    public void testRecursiveTypes() throws Exception {
+        runTest("idea/testData/multiplatform/recursiveTypes/");
+    }
 
-        @TestMetadata("typeAliasToExpectClassExplicitReference")
-        public void testTypeAliasToExpectClassExplicitReference() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/typeAliasToExpectClassExplicitReference/");
-        }
+    @TestMetadata("simple")
+    public void testSimple() throws Exception {
+        runTest("idea/testData/multiplatform/simple/");
+    }
 
-        @TestMetadata("typeAliases")
-        public void testTypeAliases() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/typeAliases/");
-        }
+    @TestMetadata("supertypes")
+    public void testSupertypes() throws Exception {
+        runTest("idea/testData/multiplatform/supertypes/");
+    }
 
-        @TestMetadata("typeParameters")
-        public void testTypeParameters() throws Exception {
-            runTest("idea/testData/multiplatformTypeRefinement/typeParameters/");
-        }
+    @TestMetadata("typeAliasToExpectClassExplicitReference")
+    public void testTypeAliasToExpectClassExplicitReference() throws Exception {
+        runTest("idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/");
+    }
+
+    @TestMetadata("typeAliases")
+    public void testTypeAliases() throws Exception {
+        runTest("idea/testData/multiplatform/typeAliases/");
+    }
+
+    @TestMetadata("typeParameters")
+    public void testTypeParameters() throws Exception {
+        runTest("idea/testData/multiplatform/typeParameters/");
+    }
+
+    @TestMetadata("useCorrectBuiltIns")
+    public void testUseCorrectBuiltIns() throws Exception {
+        runTest("idea/testData/multiplatform/useCorrectBuiltIns/");
     }
 }