diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
index c49c9c9a957..3967e25cbeb 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
index 2898dd7899d..745c644efe9 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
index 2e7c21c61b0..b34683cf718 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
index 4c830fae9dc..352d35d16b7 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
index 4d79826dbe1..241abdd9483 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: Foo.java
 
 class Foo {
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
index e41bdd0eb65..a8b3750b2a5 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: Foo.java
 
 class Foo {
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
index 4e6b80d2c6c..9c51d9dd7af 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: Foo.java
 
 class Foo {
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
index 3fd96b51caa..3da004bc51a 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
index 062d6138ef8..cfb05a3a7c0 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
index 96bae55cba5..bf488788663 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
index 26188d29034..17b1b8382b0 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
index a23d3e58203..b64f9b7fb7e 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
index e6ad6bc5888..d081871118a 100644
--- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaAnn.java
 
 import java.lang.annotation.Retention;
diff --git a/compiler/testData/codegen/boxAgainstJava/notNullAssertions/delegation.kt b/compiler/testData/codegen/boxAgainstJava/notNullAssertions/delegation.kt
index 1d52560e7ce..4b16c770283 100644
--- a/compiler/testData/codegen/boxAgainstJava/notNullAssertions/delegation.kt
+++ b/compiler/testData/codegen/boxAgainstJava/notNullAssertions/delegation.kt
@@ -28,7 +28,6 @@ fun box(): String {
         return "Fail: should have been an exception"
     }
     catch(e: IllegalStateException) {
-        println(e.message)
         return "OK"
     }
 }
diff --git a/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt b/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
index 6927482e66e..82d511f7988 100644
--- a/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
+++ b/compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt
@@ -1,10 +1,10 @@
+// WITH_RUNTIME
 // FILE: J.java
 
 public class J {}
 
 // FILE: 1.kt
 
-import kotlin.reflect.jvm.*
 import kotlin.test.assertEquals
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
index 3c1d7f9a097..b628af9941b 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt
@@ -1,3 +1,4 @@
+// WITH_RUNTIME
 // FILE: JavaInterface.java
 
 interface JavaInterface {
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt
index 668b66d9508..3c7f3bc048a 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: Super.java
 
 class Super {
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt b/compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt
index 68285327d14..8456d4b0035 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: Custom.java
 
 class Custom {
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/kt11696.kt b/compiler/testData/codegen/boxAgainstJava/sam/kt11696.kt
index e3547474aa9..92c0d63c09f 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/kt11696.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/kt11696.kt
@@ -1,4 +1,5 @@
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: Promise.java
 import org.jetbrains.annotations.NotNull;
 
diff --git a/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt b/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt
index a5339d440ec..bb55adc2dd2 100644
--- a/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt
+++ b/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt
@@ -1,5 +1,6 @@
 // SKIP_JDK6
 // IGNORE_BACKEND: JVM_IR
+// WITH_RUNTIME
 // FILE: JavaClass.java
 
 class JavaClass {
diff --git a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid1.kt b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid1.kt
index 408816e4bc4..353b0dcd215 100644
--- a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid1.kt
+++ b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid1.kt
@@ -17,7 +17,7 @@ class JavaClass {
 
 fun box(): String {
     val javaClass = JavaClass()
-    if (javaClass.x.isEmpty()) {
+    if (javaClass.x == "") {
         javaClass.x = "OK"
     }
     return javaClass.x
diff --git a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid2.kt b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid2.kt
index 904c9448f58..ff4e643ff69 100644
--- a/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid2.kt
+++ b/compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setterNonVoid2.kt
@@ -17,7 +17,7 @@ class JavaClass {
 
 fun box(): String {
     val javaClass = JavaClass()
-    if (javaClass.x.isEmpty()) {
+    if (javaClass.x == "") {
         javaClass.x = "OK"
     }
     return javaClass.x
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
index 1c48829d9a0..b156c94e28a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.codegen
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
-import org.jetbrains.kotlin.test.ConfigurationKind
 import java.io.File
 
 abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenTest() {
@@ -39,8 +38,4 @@ abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenT
             configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true)
         }
     }
-
-    override fun extractConfigurationKind(files: MutableList<TestFile>): ConfigurationKind {
-        return ConfigurationKind.ALL
-    }
 }