diff --git a/idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjects.kt b/idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjectsRuntime.kt
similarity index 98%
rename from idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjects.kt
rename to idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjectsRuntime.kt
index aee80a113af..1d6f6292436 100644
--- a/idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjects.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjectsRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo() {
     when {
         true -> <selection>{
diff --git a/idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjects.kt.match b/idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjectsRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjects.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjectsRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/controlStructures/blocks/localFunctions.kt b/idea/testData/unifier/equivalence/controlStructures/blocks/localFunctionsRuntime.kt
similarity index 96%
rename from idea/testData/unifier/equivalence/controlStructures/blocks/localFunctions.kt
rename to idea/testData/unifier/equivalence/controlStructures/blocks/localFunctionsRuntime.kt
index 398af0d280f..5c5eb4d6794 100644
--- a/idea/testData/unifier/equivalence/controlStructures/blocks/localFunctions.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/blocks/localFunctionsRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo() {
     when {
         true -> <selection>{
diff --git a/idea/testData/unifier/equivalence/controlStructures/blocks/localFunctions.kt.match b/idea/testData/unifier/equivalence/controlStructures/blocks/localFunctionsRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/blocks/localFunctions.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/blocks/localFunctionsRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/controlStructures/blocks/localVars.kt b/idea/testData/unifier/equivalence/controlStructures/blocks/localVarsRuntime.kt
similarity index 95%
rename from idea/testData/unifier/equivalence/controlStructures/blocks/localVars.kt
rename to idea/testData/unifier/equivalence/controlStructures/blocks/localVarsRuntime.kt
index 81ab1081987..0859936c66c 100644
--- a/idea/testData/unifier/equivalence/controlStructures/blocks/localVars.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/blocks/localVarsRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo() {
     when {
         true -> <selection>{
diff --git a/idea/testData/unifier/equivalence/controlStructures/blocks/localVars.kt.match b/idea/testData/unifier/equivalence/controlStructures/blocks/localVarsRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/blocks/localVars.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/blocks/localVarsRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/controlStructures/doWhile.kt b/idea/testData/unifier/equivalence/controlStructures/doWhileRuntime.kt
similarity index 95%
rename from idea/testData/unifier/equivalence/controlStructures/doWhile.kt
rename to idea/testData/unifier/equivalence/controlStructures/doWhileRuntime.kt
index 239a99293cd..f46ddb64b61 100644
--- a/idea/testData/unifier/equivalence/controlStructures/doWhile.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/doWhileRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo(a: Int, b: Int) {
     var t = a
     <selection>do {
diff --git a/idea/testData/unifier/equivalence/controlStructures/doWhile.kt.match b/idea/testData/unifier/equivalence/controlStructures/doWhileRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/doWhile.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/doWhileRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/controlStructures/for.kt b/idea/testData/unifier/equivalence/controlStructures/forRuntime.kt
similarity index 94%
rename from idea/testData/unifier/equivalence/controlStructures/for.kt
rename to idea/testData/unifier/equivalence/controlStructures/forRuntime.kt
index 834bea5d228..63c33d5c365 100644
--- a/idea/testData/unifier/equivalence/controlStructures/for.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/forRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo(a: Int, b: Int) {
     <selection>for (i in a - b..a + b) {
         println(i*i)
diff --git a/idea/testData/unifier/equivalence/controlStructures/for.kt.match b/idea/testData/unifier/equivalence/controlStructures/forRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/for.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/forRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/controlStructures/ifElse.kt b/idea/testData/unifier/equivalence/controlStructures/ifElseRuntime.kt
similarity index 95%
rename from idea/testData/unifier/equivalence/controlStructures/ifElse.kt
rename to idea/testData/unifier/equivalence/controlStructures/ifElseRuntime.kt
index 1a808f5f91a..b753e3f9c28 100644
--- a/idea/testData/unifier/equivalence/controlStructures/ifElse.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/ifElseRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo(a: Int, b: Int) {
     if ((a) + b > 0) {
         println(a*b)
diff --git a/idea/testData/unifier/equivalence/controlStructures/ifElse.kt.match b/idea/testData/unifier/equivalence/controlStructures/ifElseRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/ifElse.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/ifElseRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/controlStructures/if.kt b/idea/testData/unifier/equivalence/controlStructures/ifRuntime.kt
similarity index 94%
rename from idea/testData/unifier/equivalence/controlStructures/if.kt
rename to idea/testData/unifier/equivalence/controlStructures/ifRuntime.kt
index 873e56deb7b..165ea5a7ea5 100644
--- a/idea/testData/unifier/equivalence/controlStructures/if.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/ifRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo(a: Int, b: Int) {
     <selection>if ((a) + b > 0) {
         println(a*(b))
diff --git a/idea/testData/unifier/equivalence/controlStructures/if.kt.match b/idea/testData/unifier/equivalence/controlStructures/ifRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/if.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/ifRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/controlStructures/whenWithSubject.kt b/idea/testData/unifier/equivalence/controlStructures/whenWithSubjectRuntime.kt
similarity index 97%
rename from idea/testData/unifier/equivalence/controlStructures/whenWithSubject.kt
rename to idea/testData/unifier/equivalence/controlStructures/whenWithSubjectRuntime.kt
index d5d64bdf6a1..b060aec1862 100644
--- a/idea/testData/unifier/equivalence/controlStructures/whenWithSubject.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/whenWithSubjectRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo(a: Int, b: Int) {
     <selection>when((a)) {
         1 -> println(b)
diff --git a/idea/testData/unifier/equivalence/controlStructures/whenWithSubject.kt.match b/idea/testData/unifier/equivalence/controlStructures/whenWithSubjectRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/whenWithSubject.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/whenWithSubjectRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/controlStructures/whenWithoutSubject.kt b/idea/testData/unifier/equivalence/controlStructures/whenWithoutSubjectRuntime.kt
similarity index 96%
rename from idea/testData/unifier/equivalence/controlStructures/whenWithoutSubject.kt
rename to idea/testData/unifier/equivalence/controlStructures/whenWithoutSubjectRuntime.kt
index d700c35bb95..a56b5827769 100644
--- a/idea/testData/unifier/equivalence/controlStructures/whenWithoutSubject.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/whenWithoutSubjectRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo(a: Int, b: Int) {
     <selection>when {
         (a == 1) -> println(b)
diff --git a/idea/testData/unifier/equivalence/controlStructures/whenWithoutSubject.kt.match b/idea/testData/unifier/equivalence/controlStructures/whenWithoutSubjectRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/whenWithoutSubject.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/whenWithoutSubjectRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/controlStructures/while.kt b/idea/testData/unifier/equivalence/controlStructures/whileRuntime.kt
similarity index 95%
rename from idea/testData/unifier/equivalence/controlStructures/while.kt
rename to idea/testData/unifier/equivalence/controlStructures/whileRuntime.kt
index ac2c094bcf7..688dc3aef24 100644
--- a/idea/testData/unifier/equivalence/controlStructures/while.kt
+++ b/idea/testData/unifier/equivalence/controlStructures/whileRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo(a: Int, b: Int) {
     var t = a
     <selection>while (t != (a + b)) {
diff --git a/idea/testData/unifier/equivalence/controlStructures/while.kt.match b/idea/testData/unifier/equivalence/controlStructures/whileRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/controlStructures/while.kt.match
rename to idea/testData/unifier/equivalence/controlStructures/whileRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParams.kt b/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParamsRuntime.kt
similarity index 96%
rename from idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParams.kt
rename to idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParamsRuntime.kt
index 6e8c033be40..de19513abe7 100644
--- a/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParams.kt
+++ b/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParamsRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo(f: (Int) -> Unit) {
     <selection>{ (n: Int, s: String) ->
         val a = n + 1
diff --git a/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParams.kt.match b/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParamsRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParams.kt.match
rename to idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParamsRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArguments.kt b/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArgumentsRuntime.kt
similarity index 97%
rename from idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArguments.kt
rename to idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArgumentsRuntime.kt
index 2b725bff2a0..a321ede61ac 100644
--- a/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArguments.kt
+++ b/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArgumentsRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun foo(f: (Int) -> Unit) {
     { (m: Int, n: Int, s: String) ->
         val a = n + m
diff --git a/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArguments.kt.match b/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArgumentsRuntime.kt.match
similarity index 97%
rename from idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArguments.kt.match
rename to idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArgumentsRuntime.kt.match
index 684b72ada1d..c0c44666ce8 100644
--- a/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArguments.kt.match
+++ b/idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArgumentsRuntime.kt.match
@@ -14,4 +14,4 @@
         val m = a + this
         println(b)
         f(m)
-    }
\ No newline at end of file
+    }
diff --git a/idea/testData/unifier/equivalence/expressions/callableReferences/classRef.kt b/idea/testData/unifier/equivalence/expressions/callableReferences/classRefRuntime.kt
similarity index 90%
rename from idea/testData/unifier/equivalence/expressions/callableReferences/classRef.kt
rename to idea/testData/unifier/equivalence/expressions/callableReferences/classRefRuntime.kt
index 965f38c9c76..a6c2cac0326 100644
--- a/idea/testData/unifier/equivalence/expressions/callableReferences/classRef.kt
+++ b/idea/testData/unifier/equivalence/expressions/callableReferences/classRefRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 class A {
     inner class B
 
diff --git a/idea/testData/unifier/equivalence/expressions/callableReferences/classRef.kt.match b/idea/testData/unifier/equivalence/expressions/callableReferences/classRefRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/callableReferences/classRef.kt.match
rename to idea/testData/unifier/equivalence/expressions/callableReferences/classRefRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/expressions/callableReferences/functionRef.kt b/idea/testData/unifier/equivalence/expressions/callableReferences/functionRefRuntime.kt
similarity index 91%
rename from idea/testData/unifier/equivalence/expressions/callableReferences/functionRef.kt
rename to idea/testData/unifier/equivalence/expressions/callableReferences/functionRefRuntime.kt
index f21cec00598..2091bb57eee 100644
--- a/idea/testData/unifier/equivalence/expressions/callableReferences/functionRef.kt
+++ b/idea/testData/unifier/equivalence/expressions/callableReferences/functionRefRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 class A {
     fun bar() {
 
diff --git a/idea/testData/unifier/equivalence/expressions/callableReferences/functionRef.kt.match b/idea/testData/unifier/equivalence/expressions/callableReferences/functionRefRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/callableReferences/functionRef.kt.match
rename to idea/testData/unifier/equivalence/expressions/callableReferences/functionRefRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/expressions/calls/externalArguments.kt b/idea/testData/unifier/equivalence/expressions/calls/externalArgumentsRuntime.kt
similarity index 95%
rename from idea/testData/unifier/equivalence/expressions/calls/externalArguments.kt
rename to idea/testData/unifier/equivalence/expressions/calls/externalArgumentsRuntime.kt
index 0e832251ca5..df57bd50da8 100644
--- a/idea/testData/unifier/equivalence/expressions/calls/externalArguments.kt
+++ b/idea/testData/unifier/equivalence/expressions/calls/externalArgumentsRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 fun Int.contains(n: Int): Boolean = n < this
 
 fun foo(n: Int): Int {
diff --git a/idea/testData/unifier/equivalence/expressions/calls/externalArguments.kt.match b/idea/testData/unifier/equivalence/expressions/calls/externalArgumentsRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/calls/externalArguments.kt.match
rename to idea/testData/unifier/equivalence/expressions/calls/externalArgumentsRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssign.kt b/idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssignRuntime.kt
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssign.kt
rename to idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssignRuntime.kt
diff --git a/idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssign.kt.match b/idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssignRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssign.kt.match
rename to idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssignRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/expressions/conventions/assignments/set.kt b/idea/testData/unifier/equivalence/expressions/conventions/assignments/setRuntime.kt
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/conventions/assignments/set.kt
rename to idea/testData/unifier/equivalence/expressions/conventions/assignments/setRuntime.kt
diff --git a/idea/testData/unifier/equivalence/expressions/conventions/assignments/set.kt.match b/idea/testData/unifier/equivalence/expressions/conventions/assignments/setRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/conventions/assignments/set.kt.match
rename to idea/testData/unifier/equivalence/expressions/conventions/assignments/setRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/expressions/conventions/contains.kt b/idea/testData/unifier/equivalence/expressions/conventions/containsRuntime.kt
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/conventions/contains.kt
rename to idea/testData/unifier/equivalence/expressions/conventions/containsRuntime.kt
diff --git a/idea/testData/unifier/equivalence/expressions/conventions/contains.kt.match b/idea/testData/unifier/equivalence/expressions/conventions/containsRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/conventions/contains.kt.match
rename to idea/testData/unifier/equivalence/expressions/conventions/containsRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/expressions/conventions/get.kt b/idea/testData/unifier/equivalence/expressions/conventions/getRuntime.kt
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/conventions/get.kt
rename to idea/testData/unifier/equivalence/expressions/conventions/getRuntime.kt
diff --git a/idea/testData/unifier/equivalence/expressions/conventions/get.kt.match b/idea/testData/unifier/equivalence/expressions/conventions/getRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/conventions/get.kt.match
rename to idea/testData/unifier/equivalence/expressions/conventions/getRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/expressions/simpleName.kt b/idea/testData/unifier/equivalence/expressions/simpleNameRuntime.kt
similarity index 87%
rename from idea/testData/unifier/equivalence/expressions/simpleName.kt
rename to idea/testData/unifier/equivalence/expressions/simpleNameRuntime.kt
index 0e444fd86e3..a50693aa8fb 100644
--- a/idea/testData/unifier/equivalence/expressions/simpleName.kt
+++ b/idea/testData/unifier/equivalence/expressions/simpleNameRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 var a = 1
 val b = <selection>a</selection> + 1
 
diff --git a/idea/testData/unifier/equivalence/expressions/simpleName.kt.match b/idea/testData/unifier/equivalence/expressions/simpleNameRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/simpleName.kt.match
rename to idea/testData/unifier/equivalence/expressions/simpleNameRuntime.kt.match
diff --git a/idea/testData/unifier/equivalence/expressions/this/simpleThis1.kt b/idea/testData/unifier/equivalence/expressions/this/simpleThis1Runtime.kt
similarity index 95%
rename from idea/testData/unifier/equivalence/expressions/this/simpleThis1.kt
rename to idea/testData/unifier/equivalence/expressions/this/simpleThis1Runtime.kt
index 3e0161d6a48..797cf89da5c 100644
--- a/idea/testData/unifier/equivalence/expressions/this/simpleThis1.kt
+++ b/idea/testData/unifier/equivalence/expressions/this/simpleThis1Runtime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 class A {
     fun foo() {
         println(<selection>this</selection>)
diff --git a/idea/testData/unifier/equivalence/expressions/this/simpleThis1.kt.match b/idea/testData/unifier/equivalence/expressions/this/simpleThis1Runtime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/this/simpleThis1.kt.match
rename to idea/testData/unifier/equivalence/expressions/this/simpleThis1Runtime.kt.match
diff --git a/idea/testData/unifier/equivalence/expressions/this/simpleThis2.kt b/idea/testData/unifier/equivalence/expressions/this/simpleThis2Runtime.kt
similarity index 95%
rename from idea/testData/unifier/equivalence/expressions/this/simpleThis2.kt
rename to idea/testData/unifier/equivalence/expressions/this/simpleThis2Runtime.kt
index b7ec38f1c49..811eef45397 100644
--- a/idea/testData/unifier/equivalence/expressions/this/simpleThis2.kt
+++ b/idea/testData/unifier/equivalence/expressions/this/simpleThis2Runtime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 class A {
     fun foo() {
         println(this)
diff --git a/idea/testData/unifier/equivalence/expressions/this/simpleThis2.kt.match b/idea/testData/unifier/equivalence/expressions/this/simpleThis2Runtime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/expressions/this/simpleThis2.kt.match
rename to idea/testData/unifier/equivalence/expressions/this/simpleThis2Runtime.kt.match
diff --git a/idea/testData/unifier/equivalence/types/userType.kt b/idea/testData/unifier/equivalence/types/userTypeRuntime.kt
similarity index 95%
rename from idea/testData/unifier/equivalence/types/userType.kt
rename to idea/testData/unifier/equivalence/types/userTypeRuntime.kt
index eb16c3143c7..13295133591 100644
--- a/idea/testData/unifier/equivalence/types/userType.kt
+++ b/idea/testData/unifier/equivalence/types/userTypeRuntime.kt
@@ -1,4 +1,3 @@
-// WITH_RUNTIME
 import java.util.HashMap
 
 val a: <selection>Map<String, MutableList<Any>></selection> = HashMap()
diff --git a/idea/testData/unifier/equivalence/types/userType.kt.match b/idea/testData/unifier/equivalence/types/userTypeRuntime.kt.match
similarity index 100%
rename from idea/testData/unifier/equivalence/types/userType.kt.match
rename to idea/testData/unifier/equivalence/types/userTypeRuntime.kt.match
diff --git a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt b/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt
index f72e1958957..54ccb492e0e 100644
--- a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt
+++ b/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt
@@ -52,28 +52,16 @@ public abstract class AbstractJetPsiUnifierTest: JetLightCodeInsightFixtureTestC
         myFixture.configureByFile(filePath)
         val file = myFixture.getFile() as JetFile
 
-        val withRuntime = InTextDirectivesUtils.findStringWithPrefixes(file.getText(), "// WITH_RUNTIME") != null
-        if (withRuntime) {
-            ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.fullJdk())
-        }
+        DirectiveBasedActionUtils.checkForUnexpectedErrors(file)
 
-        try {
-            DirectiveBasedActionUtils.checkForUnexpectedErrors(file)
-
-            val actualText =
-                    findPattern(file)
-                            .toRange()
-                            .match(file, JetPsiUnifier.DEFAULT)
-                            .map { it.range.getTextRange().substring(file.getText()!!) }
-                            .joinToString("\n\n")
-            JetTestUtils.assertEqualsToFile(File("$filePath.match"), actualText)
-        }
-        finally {
-            if (withRuntime) {
-                ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.fullJdk())
-            }
-        }
+        val actualText =
+                findPattern(file)
+                        .toRange()
+                        .match(file, JetPsiUnifier.DEFAULT)
+                        .map { it.range.getTextRange().substring(file.getText()!!) }
+                        .joinToString("\n\n")
+        JetTestUtils.assertEqualsToFile(File("$filePath.match"), actualText)
     }
 
-    override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor(): LightProjectDescriptor = getProjectDescriptorFromTestName()
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java b/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java
index 4574a524f79..2eb95019fae 100644
--- a/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java
@@ -67,27 +67,27 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                 doTest(fileName);
             }
 
-            @TestMetadata("doWhile.kt")
-            public void testDoWhile() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/doWhile.kt");
+            @TestMetadata("doWhileRuntime.kt")
+            public void testDoWhileRuntime() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/doWhileRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("for.kt")
-            public void testFor() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/for.kt");
+            @TestMetadata("forRuntime.kt")
+            public void testForRuntime() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/forRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("if.kt")
-            public void testIf() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/if.kt");
+            @TestMetadata("ifElseRuntime.kt")
+            public void testIfElseRuntime() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/ifElseRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("ifElse.kt")
-            public void testIfElse() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/ifElse.kt");
+            @TestMetadata("ifRuntime.kt")
+            public void testIfRuntime() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/ifRuntime.kt");
                 doTest(fileName);
             }
 
@@ -115,21 +115,21 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                 doTest(fileName);
             }
 
-            @TestMetadata("whenWithSubject.kt")
-            public void testWhenWithSubject() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whenWithSubject.kt");
+            @TestMetadata("whenWithSubjectRuntime.kt")
+            public void testWhenWithSubjectRuntime() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whenWithSubjectRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("whenWithoutSubject.kt")
-            public void testWhenWithoutSubject() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whenWithoutSubject.kt");
+            @TestMetadata("whenWithoutSubjectRuntime.kt")
+            public void testWhenWithoutSubjectRuntime() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whenWithoutSubjectRuntime.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("while.kt")
-            public void testWhile() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/while.kt");
+            @TestMetadata("whileRuntime.kt")
+            public void testWhileRuntime() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whileRuntime.kt");
                 doTest(fileName);
             }
 
@@ -141,21 +141,21 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/controlStructures/blocks"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
-                @TestMetadata("anonymousObjects.kt")
-                public void testAnonymousObjects() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjects.kt");
+                @TestMetadata("anonymousObjectsRuntime.kt")
+                public void testAnonymousObjectsRuntime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjectsRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("localFunctions.kt")
-                public void testLocalFunctions() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/localFunctions.kt");
+                @TestMetadata("localFunctionsRuntime.kt")
+                public void testLocalFunctionsRuntime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/localFunctionsRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("localVars.kt")
-                public void testLocalVars() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/localVars.kt");
+                @TestMetadata("localVarsRuntime.kt")
+                public void testLocalVarsRuntime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/localVarsRuntime.kt");
                     doTest(fileName);
                 }
             }
@@ -274,9 +274,9 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations/localCallables/lambdas"), Pattern.compile("^(.+)\\.kt$"), true);
                     }
 
-                    @TestMetadata("multipleParams.kt")
-                    public void testMultipleParams() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParams.kt");
+                    @TestMetadata("multipleParamsRuntime.kt")
+                    public void testMultipleParamsRuntime() throws Exception {
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParamsRuntime.kt");
                         doTest(fileName);
                     }
 
@@ -286,9 +286,9 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                         doTest(fileName);
                     }
 
-                    @TestMetadata("receiverArguments.kt")
-                    public void testReceiverArguments() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArguments.kt");
+                    @TestMetadata("receiverArgumentsRuntime.kt")
+                    public void testReceiverArgumentsRuntime() throws Exception {
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArgumentsRuntime.kt");
                         doTest(fileName);
                     }
 
@@ -349,9 +349,9 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                 doTest(fileName);
             }
 
-            @TestMetadata("simpleName.kt")
-            public void testSimpleName() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/simpleName.kt");
+            @TestMetadata("simpleNameRuntime.kt")
+            public void testSimpleNameRuntime() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/simpleNameRuntime.kt");
                 doTest(fileName);
             }
 
@@ -369,15 +369,15 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/callableReferences"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
-                @TestMetadata("classRef.kt")
-                public void testClassRef() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/callableReferences/classRef.kt");
+                @TestMetadata("classRefRuntime.kt")
+                public void testClassRefRuntime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/callableReferences/classRefRuntime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("functionRef.kt")
-                public void testFunctionRef() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/callableReferences/functionRef.kt");
+                @TestMetadata("functionRefRuntime.kt")
+                public void testFunctionRefRuntime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/callableReferences/functionRefRuntime.kt");
                     doTest(fileName);
                 }
             }
@@ -396,9 +396,9 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                     doTest(fileName);
                 }
 
-                @TestMetadata("externalArguments.kt")
-                public void testExternalArguments() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/externalArguments.kt");
+                @TestMetadata("externalArgumentsRuntime.kt")
+                public void testExternalArgumentsRuntime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/externalArgumentsRuntime.kt");
                     doTest(fileName);
                 }
 
@@ -475,9 +475,9 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/conventions"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
-                @TestMetadata("contains.kt")
-                public void testContains() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/contains.kt");
+                @TestMetadata("containsRuntime.kt")
+                public void testContainsRuntime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/containsRuntime.kt");
                     doTest(fileName);
                 }
 
@@ -487,9 +487,9 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                     doTest(fileName);
                 }
 
-                @TestMetadata("get.kt")
-                public void testGet() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/get.kt");
+                @TestMetadata("getRuntime.kt")
+                public void testGetRuntime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/getRuntime.kt");
                     doTest(fileName);
                 }
 
@@ -543,9 +543,9 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/conventions/assignments"), Pattern.compile("^(.+)\\.kt$"), true);
                     }
 
-                    @TestMetadata("indexedPlusAssign.kt")
-                    public void testIndexedPlusAssign() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssign.kt");
+                    @TestMetadata("indexedPlusAssignRuntime.kt")
+                    public void testIndexedPlusAssignRuntime() throws Exception {
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssignRuntime.kt");
                         doTest(fileName);
                     }
 
@@ -567,9 +567,9 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                         doTest(fileName);
                     }
 
-                    @TestMetadata("set.kt")
-                    public void testSet() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/set.kt");
+                    @TestMetadata("setRuntime.kt")
+                    public void testSetRuntime() throws Exception {
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/setRuntime.kt");
                         doTest(fileName);
                     }
                 }
@@ -718,15 +718,15 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                     doTest(fileName);
                 }
 
-                @TestMetadata("simpleThis1.kt")
-                public void testSimpleThis1() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/simpleThis1.kt");
+                @TestMetadata("simpleThis1Runtime.kt")
+                public void testSimpleThis1Runtime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/simpleThis1Runtime.kt");
                     doTest(fileName);
                 }
 
-                @TestMetadata("simpleThis2.kt")
-                public void testSimpleThis2() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/simpleThis2.kt");
+                @TestMetadata("simpleThis2Runtime.kt")
+                public void testSimpleThis2Runtime() throws Exception {
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/simpleThis2Runtime.kt");
                     doTest(fileName);
                 }
             }
@@ -770,9 +770,9 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest {
                 doTest(fileName);
             }
 
-            @TestMetadata("userType.kt")
-            public void testUserType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/userType.kt");
+            @TestMetadata("userTypeRuntime.kt")
+            public void testUserTypeRuntime() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/userTypeRuntime.kt");
                 doTest(fileName);
             }
         }