diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt
index f0287ad5fb0..077998c33d7 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixCall.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 import helpers.*
 import kotlin.coroutines.experimental.*
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt
index f4088e3a83b..6b1ecd9e4ca 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/infixRecursiveCall.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 import helpers.*
 import kotlin.coroutines.experimental.*
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt
index 78b4c3cef5f..a3e07f8f56e 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realIteratorFoldl.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 import helpers.*
 import kotlin.coroutines.experimental.*
 
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt
index 2f934d73d95..5cd710e4333 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/realStringRepeat.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 import helpers.*
 import kotlin.coroutines.experimental.*
 
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt
index 27c6d86c079..3600eafc3d1 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/returnInParentheses.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 import helpers.*
 import kotlin.coroutines.experimental.*
 
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt
index 411725bd761..99952664024 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/sum.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 import helpers.*
 import kotlin.coroutines.experimental.*
 
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt
index bcb60f468f5..168b8f7d2c5 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInBlockInParentheses.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 import helpers.*
 import kotlin.coroutines.experimental.*
 
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt
index ccbf0fb9b94..9f0d5831654 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/tailCallInParentheses.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 import helpers.*
 import kotlin.coroutines.experimental.*
 
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt
index d7e99c21f6a..e4901f6dc4c 100644
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt
+++ b/compiler/testData/codegen/box/coroutines/featureIntersection/tailrec/whenWithIs.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // WITH_COROUTINES
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 import helpers.*
 import kotlin.coroutines.experimental.*
 
diff --git a/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt b/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt
index f47d96878ae..dfb67ed71a5 100644
--- a/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt
+++ b/compiler/testData/codegen/box/coroutines/localFunctions/anonymous/simple.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JVM, JS, NATIVE
+// IGNORE_BACKEND: JVM, JS, NATIVE
 // WITH_RUNTIME
 // WITH_COROUTINES
 
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt
index 77551daaaf2..65fe86aabdf 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun test(x : Int = 0, e : Any = "a") {
     if (!e.equals("a")) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt
index 2f924b56908..1be18fe5207 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 open class A {
     open fun foo(s: String = "OK") = s
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt
index e9873fc4a14..2ed5885bda2 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun Int.foo(x: Int) {
     if (x == 0) return
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt
index 15eb0203244..d2608da28bb 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 <!NO_TAIL_CALLS_FOUND!>tailrec fun noTails()<!> {
     // nothing here
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt
index c6b15a3234d..35b357dd127 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun badTails(x : Int) : Int {
     if (x < 50 && x != 10 && x > 0) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt
index 06b569df4d4..d76bcdc041c 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 fun withoutAnnotation(x : Int) : Int {
     if (x > 0) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt
index 4642b88c175..2ff8aea820e 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec infix fun Int.test(x : Int) : Int {
     if (this > 1) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt
index 09212b1ad4b..ae9c4b5530d 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec infix fun Int.foo(x: Int) {
     if (x == 0) return
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt
index d758897bde5..71029d180b5 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun test(counter : Int) : Int? {
     if (counter < 0) return null
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt
index 307a0163bca..2941b1ee04b 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt
@@ -1,7 +1,8 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 class B {
     inner class C {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt
index 0eac7241a86..ddc0e070e49 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun test(x : Int) : Int {
     var z = if (x > 3) 3 else x
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt
index 597ca8dd231..8b68f9d10f9 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun test(x : Int) : Int {
     if (x == 1) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt
index a4523b4320d..ebf3ee6cff6 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt
@@ -1,5 +1,5 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun <T, A> Iterator<T>.foldl(acc : A, foldFunction : (e : T, acc : A) -> A) : A =
         if (!hasNext()) acc
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt
index f78c458a8e6..effd859f18a 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 fun escapeChar(c : Char) : String? = when (c) {
     '\\' -> "\\\\"
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt
index 2772ef3c3a2..3f39ccc222e 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun String.repeat(num : Int, acc : StringBuilder = StringBuilder()) : String =
         if (num == 0) acc.toString()
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt
index e53fc49a214..808b0406ce8 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt
@@ -1,7 +1,8 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 <!NO_TAIL_CALLS_FOUND!>tailrec fun foo()<!> {
     bar {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt
index c6e5fe2a79f..cdbd80df373 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 <!NO_TAIL_CALLS_FOUND!>tailrec fun foo()<!> {
     fun bar() {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt
index cf6ac28a2b1..bfb7320b4f7 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 fun test() {
     tailrec fun g3(counter : Int) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt
index f974aac542d..0b7d3d0f17f 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun test(x : Int) : Int {
     return if (x == 1) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt
index 94541e9b0ad..c77f4123ac8 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 <!NO_TAIL_CALLS_FOUND!>tailrec fun test(counter : Int) : Int<!> {
     if (counter == 0) return 0
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt
index 37c8bde1bd5..c3277d9a598 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 <!NO_TAIL_CALLS_FOUND!>tailrec fun test(counter : Int) : Int<!> {
     if (counter == 0) return 0
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt
index a91a01c4007..f350e2dd014 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 <!NO_TAIL_CALLS_FOUND!>tailrec fun test(counter : Int) : Int<!> {
     if (counter == 0) return 0
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt
index 6a05a80c18d..d9282fcea72 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun foo(x: Int) {
     if (x == 0) return
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt
index f3c225f251e..50c8d3cff55 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 <!NO_TAIL_CALLS_FOUND!>tailrec fun test(counter : Int) : Int<!> {
     if (counter == 0) return 0
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt
index 7d2cf67bd63..fbdc2c52b2c 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun test(x : Int) : Int =
     if (x == 1) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt
index 497f0456cf8..97ad9455974 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun test(x : Int) : Int {
     if (x == 10) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt
index 5e41e54a3cb..571231ac581 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun test(x : Int) : Int {
     if (x == 0) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt
index 461f09c5ec1..8a2ae5e6a68 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt
@@ -1,5 +1,5 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun sum(x: Long, sum: Long): Long {
     if (x == 0.toLong()) return sum
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt
index 92fd0bf3ffb..4655ecc7a61 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun foo(x: Int) {
     return if (x > 0) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt
index d0c54318be0..352c3b4f0fb 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun foo(x: Int) {
     if (x == 0) return
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt
index a69c34bd44c..55167668b2c 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 <!NO_TAIL_CALLS_FOUND!>tailrec fun test(go: Boolean) : Unit<!> {
     if (!go) return
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt
index b067a3c5717..cbd01211540 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 class A {
     tailrec fun f1(c : Int) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt
index 9324f76ad43..5416b17429f 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun test(x : Int) : Unit {
     if (x == 1) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt
index c87fb69a91e..c61e296edd8 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun withWhen(counter : Int) : Int =
         when (counter) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt
index 9ceaf639f08..477818f6ab2 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt
@@ -1,7 +1,8 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun withWhen(counter : Int, d : Any) : Int =
         when (counter) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt
index d86ee798725..f1f92e1dbb4 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
 
 tailrec fun withWhen(counter : Int, d : Any) : Int =
     if (counter == 0) {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt
index 154371bacee..38caa4516fc 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt
@@ -1,5 +1,6 @@
 // TODO: muted automatically, investigate should it be ran for JS or not
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// DONT_RUN_GENERATED_CODE: JS
+// IGNORE_BACKEND: JS
 
 tailrec fun withWhen2(counter : Int) : Int =
         when {
diff --git a/compiler/testData/codegen/box/reflection/specialBuiltIns/getMembersOfStandardJavaClasses.kt b/compiler/testData/codegen/box/reflection/specialBuiltIns/getMembersOfStandardJavaClasses.kt
index 0927f54846d..90455544d6a 100644
--- a/compiler/testData/codegen/box/reflection/specialBuiltIns/getMembersOfStandardJavaClasses.kt
+++ b/compiler/testData/codegen/box/reflection/specialBuiltIns/getMembersOfStandardJavaClasses.kt
@@ -6,7 +6,7 @@
 // See KT-11258 Incorrect resolution sequence for Java field
 
 // TODO: enable this test on JVM, see KT-16616
-// IGNORE_BACKEND_WITHOUT_CHECK: JVM
+// IGNORE_BACKEND: JVM
 
 import java.util.*
 
diff --git a/idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument/directives.txt b/idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument/directives.txt
index bb1ac5093cc..0d65498a97d 100644
--- a/idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument/directives.txt
+++ b/idea/testData/decompiler/decompiledText/LocalClassAsTypeWithArgument/directives.txt
@@ -1,2 +1,2 @@
 // TODO: See KT-13618
-// IGNORE_BACKEND_WITHOUT_CHECK: JS
+// IGNORE_BACKEND: JS
diff --git a/idea/testData/decompiler/decompiledText/SecondaryConstructors.expected.kt b/idea/testData/decompiler/decompiledText/SecondaryConstructors.expected.kt
index e031908db5f..491e536487b 100644
--- a/idea/testData/decompiler/decompiledText/SecondaryConstructors.expected.kt
+++ b/idea/testData/decompiler/decompiledText/SecondaryConstructors.expected.kt
@@ -8,7 +8,7 @@ public final class SecondaryConstructors public constructor(x: kotlin.Boolean) {
 
     private constructor(x: kotlin.Int) { /* compiled code */ }
 
-    public final inner class Inner<T : kotlin.String, G : kotlin.Int> where G : java.io.Serializable {
+    public final inner class Inner<T : kotlin.String, G : kotlin.Int> where G : kotlin.Comparable<kotlin.Int> {
         public constructor(x: T, g: G) { /* compiled code */ }
     }
 
@@ -17,4 +17,8 @@ public final class SecondaryConstructors public constructor(x: kotlin.Boolean) {
 
         internal constructor() { /* compiled code */ }
     }
-}
\ No newline at end of file
+}
+
+public final annotation class anno public constructor() : kotlin.Annotation {
+}
+
diff --git a/idea/testData/decompiler/decompiledText/SecondaryConstructors/SecondaryConstructors.kt b/idea/testData/decompiler/decompiledText/SecondaryConstructors/SecondaryConstructors.kt
index 6530f879197..e372040cc9a 100644
--- a/idea/testData/decompiler/decompiledText/SecondaryConstructors/SecondaryConstructors.kt
+++ b/idea/testData/decompiler/decompiledText/SecondaryConstructors/SecondaryConstructors.kt
@@ -1,7 +1,5 @@
 package test
 
-import java.io.Serializable
-
 class SecondaryConstructors(x: Boolean) {
     init {
     }
@@ -15,7 +13,7 @@ class SecondaryConstructors(x: Boolean) {
     private constructor(x: Int) : this(x < 0) {
     }
 
-    inner class Inner<T : String, G : Int> where G : Serializable {
+    inner class Inner<T : String, G : Int> where G : Comparable<Int> {
         constructor(x: T, g: G) {
         }
     }
diff --git a/idea/testData/decompiler/decompiledText/SecondaryConstructors/directives.txt b/idea/testData/decompiler/decompiledText/SecondaryConstructors/directives.txt
deleted file mode 100644
index c700876b606..00000000000
--- a/idea/testData/decompiler/decompiledText/SecondaryConstructors/directives.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// TODO Remove this restriction when secondary constructors will be supported in js backend.
-// See KT-7798 JS: add support for secondary constructors
-// https://youtrack.jetbrains.com/issue/KT-7798
-// IGNORE_BACKEND_WITHOUT_CHECK: JS