diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt
index 9ec98d4ede6..1801e2989ea 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt
@@ -10,4 +10,4 @@ fun test() {
 fun <T> dynamic(<!UNUSED_PARAMETER!>body<!>: dynamic.() -> T): T {
     val topLevel = null
     return topLevel.<!UNRESOLVED_REFERENCE!>body<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/comparisonToNull.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/comparisonToNull.kt
index 0cb555c90d2..71751565a1f 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/comparisonToNull.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/comparisonToNull.kt
@@ -7,4 +7,4 @@ fun test(d: dynamic) {
     d["foo"] != null
     d.foo == null
     d.foo != null
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/destructuring.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/destructuring.kt
index 523368b8592..2c283b169e8 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/destructuring.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/destructuring.kt
@@ -19,4 +19,4 @@ class A {
     operator fun iterator(): Iterator<dynamic> = TODO("")
 }
 
-fun bar(f: (dynamic) -> Unit): Unit = TODO("")
\ No newline at end of file
+fun bar(f: (dynamic) -> Unit): Unit = TODO("")
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt
index 0c82222d14b..b1701f648ed 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt
@@ -15,4 +15,4 @@ fun <!DYNAMIC_RECEIVER_NOT_ALLOWED!>dynamic<!>.test() {
     v5.isDynamic() // to check that anything is resolvable
 
     foo = 1
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inExpression.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inExpression.kt
index 864c00b8ff5..f6dfe63925a 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inExpression.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inExpression.kt
@@ -9,4 +9,4 @@ fun foo() {
     when (3) {
         <!WRONG_OPERATION_WITH_DYNAMIC!>!in<!> a -> println("ok")
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/indexedAccess.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/indexedAccess.kt
index 7aa077f205d..506a759936d 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/indexedAccess.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/indexedAccess.kt
@@ -5,4 +5,4 @@ fun foo() {
 
     a[0] = 23
     <!WRONG_OPERATION_WITH_DYNAMIC!>a[0, 1]<!> = 42
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt
index c799a2084a0..31abe4c98b2 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt
@@ -4,4 +4,4 @@ fun test(d: dynamic) {
     d.foo(1, name = "name")
 
     d.foo(1, duplicate = "", <!ARGUMENT_PASSED_TWICE!>duplicate<!> = ""<!NO_VALUE_FOR_PARAMETER!>)<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt
index b217529b22a..aeb7c4f56fe 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt
@@ -13,4 +13,4 @@ fun foo(dn: dynamic<!REDUNDANT_NULLABLE!>?<!>, d: dynamic, dnn: dynamic<!REDUNDA
     d.foo()
     d?.foo()
     d!!.foo()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/propertyDelegateBy.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/propertyDelegateBy.kt
index e794dee22c4..d92001ff648 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/propertyDelegateBy.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/propertyDelegateBy.kt
@@ -24,4 +24,4 @@ class DynamicHandler {
 
 class B {
     val x: dynamic by DynamicHandler()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/rangeExpression.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/rangeExpression.kt
index ca58339073b..888d5666c34 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/rangeExpression.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/rangeExpression.kt
@@ -11,4 +11,4 @@ fun foo() {
 
 class C {
     operator fun rangeTo(other: dynamic): ClosedRange<dynamic> = TODO("not implemented")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/spreadOperator.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/spreadOperator.kt
index 14455c76030..2be0f9c449d 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/spreadOperator.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/spreadOperator.kt
@@ -19,4 +19,4 @@ fun test(d: dynamic) {
     bar(<!WRONG_OPERATION_WITH_DYNAMIC!>*d<!>, 23, <!WRONG_OPERATION_WITH_DYNAMIC!>*d<!>)
 }
 
-fun bar(vararg x: Int): Unit = TODO("$x")
\ No newline at end of file
+fun bar(vararg x: Int): Unit = TODO("$x")
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/staticCallsInDynamicContext.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/staticCallsInDynamicContext.kt
index 0aed9b1f66b..5a5e1a95a07 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/staticCallsInDynamicContext.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/staticCallsInDynamicContext.kt
@@ -71,4 +71,4 @@ class C {
 
 class WithInvoke {
     operator fun invoke() {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/export/extendingNonExportedType.kt b/compiler/testData/diagnostics/testsWithJsStdLib/export/extendingNonExportedType.kt
index 02c05ae0ad2..7a0064ca898 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/export/extendingNonExportedType.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/export/extendingNonExportedType.kt
@@ -6,21 +6,21 @@ package foo
 open class NonExportedClass
 
 @JsExport
-class <!NON_EXPORTABLE_TYPE("super", "NonExportedClass")!>ExportedClass<!> : NonExportedClass()
+class <!NON_EXPORTABLE_TYPE("super; NonExportedClass")!>ExportedClass<!> : NonExportedClass()
 
 interface NonExportedInterface
 
 @JsExport
-class <!NON_EXPORTABLE_TYPE("super", "NonExportedInterface")!>ExportedClass2<!> : NonExportedInterface
+class <!NON_EXPORTABLE_TYPE("super; NonExportedInterface")!>ExportedClass2<!> : NonExportedInterface
 
 @JsExport
 open class ExportedGenericClass<T>
 
 @JsExport
-class <!NON_EXPORTABLE_TYPE("super", "ExportedGenericClass<NonExportedClass>")!>ExportedClass3<!> : ExportedGenericClass<NonExportedClass>()
+class <!NON_EXPORTABLE_TYPE("super; ExportedGenericClass<NonExportedClass>")!>ExportedClass3<!> : ExportedGenericClass<NonExportedClass>()
 
 @JsExport
 interface ExportedGenericInterface<T>
 
 @JsExport
-class <!NON_EXPORTABLE_TYPE("super", "ExportedGenericInterface<NonExportedClass>")!>ExportedClass4<!> : ExportedGenericInterface<NonExportedClass>
\ No newline at end of file
+class <!NON_EXPORTABLE_TYPE("super; ExportedGenericInterface<NonExportedClass>")!>ExportedClass4<!> : ExportedGenericInterface<NonExportedClass>
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInSignature.kt b/compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInSignature.kt
index 43040c58f74..1667a5eea3a 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInSignature.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInSignature.kt
@@ -7,30 +7,30 @@ package foo
 class C
 
 @JsExport
-fun foo(<!NON_EXPORTABLE_TYPE("parameter", "C")!>x: C<!>) {
+fun foo(<!NON_EXPORTABLE_TYPE("parameter; C")!>x: C<!>) {
 }
 
-<!NON_EXPORTABLE_TYPE("return", "C")!>@JsExport
+<!NON_EXPORTABLE_TYPE("return; C")!>@JsExport
 fun bar()<!> = C()
 
-<!NON_EXPORTABLE_TYPE("property", "C")!>@JsExport
+<!NON_EXPORTABLE_TYPE("property; C")!>@JsExport
 val x: C<!> = C()
 
-<!NON_EXPORTABLE_TYPE("property", "C")!>@JsExport
+<!NON_EXPORTABLE_TYPE("property; C")!>@JsExport
 var x2: C<!>
     get() = C()
     set(value) { }
 
 @JsExport
 class A(
-    <!NON_EXPORTABLE_TYPE("parameter", "C"), NON_EXPORTABLE_TYPE("property", "C")!>val x: C<!>,
-    <!NON_EXPORTABLE_TYPE("parameter", "C")!>y: C<!>
+    <!NON_EXPORTABLE_TYPE("property; C"), NON_EXPORTABLE_TYPE("parameter; C")!>val x: C<!>,
+    <!NON_EXPORTABLE_TYPE("parameter; C")!>y: C<!>
 ) {
-    <!NON_EXPORTABLE_TYPE("return", "C")!>fun foo(<!NON_EXPORTABLE_TYPE("parameter", "C")!>x: C<!>)<!> = x
+    <!NON_EXPORTABLE_TYPE("return; C")!>fun foo(<!NON_EXPORTABLE_TYPE("parameter; C")!>x: C<!>)<!> = x
 
-    <!NON_EXPORTABLE_TYPE("property", "C")!>val x2: C<!> = C()
+    <!NON_EXPORTABLE_TYPE("property; C")!>val x2: C<!> = C()
 
-    <!NON_EXPORTABLE_TYPE("property", "C")!>var x3: C<!>
+    <!NON_EXPORTABLE_TYPE("property; C")!>var x3: C<!>
         get() = C()
         set(value) { }
 }
@@ -40,7 +40,7 @@ fun foo2() {
 }
 
 @JsExport
-fun foo3(<!NON_EXPORTABLE_TYPE("parameter", "Unit")!>x: Unit<!>) {
+fun foo3(<!NON_EXPORTABLE_TYPE("parameter; Unit")!>x: Unit<!>) {
 }
 
 @JsExport
@@ -48,9 +48,9 @@ fun foo4(x: () -> Unit) {
 }
 
 @JsExport
-fun foo5(<!NON_EXPORTABLE_TYPE("parameter", "(Unit) -> Unit")!>x: (Unit) -> Unit<!>) {
+fun foo5(<!NON_EXPORTABLE_TYPE("parameter; (Unit) -> Unit")!>x: (Unit) -> Unit<!>) {
 }
 
 @JsExport
 fun foo6(x: (A) -> A) {
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInTypeParameters.kt b/compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInTypeParameters.kt
index 3c61dd81c6d..f6c80bbecab 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInTypeParameters.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInTypeParameters.kt
@@ -8,10 +8,10 @@ abstract class C
 interface I
 
 @JsExport
-fun <<!NON_EXPORTABLE_TYPE("upper bound", "C")!>T : C<!>>foo() { }
+fun <<!NON_EXPORTABLE_TYPE("upper bound; C")!>T : C<!>>foo() { }
 
 @JsExport
-class A<<!NON_EXPORTABLE_TYPE("upper bound", "C")!>T : C<!>, <!NON_EXPORTABLE_TYPE("upper bound", "I")!>S: I<!>>
+class A<<!NON_EXPORTABLE_TYPE("upper bound; C")!>T : C<!>, <!NON_EXPORTABLE_TYPE("upper bound; I")!>S: I<!>>
 
 @JsExport
-interface I2<<!NON_EXPORTABLE_TYPE("upper bound", "C"), NON_EXPORTABLE_TYPE("upper bound", "I")!>T<!>> where T : C, T : I
\ No newline at end of file
+interface I2<<!NON_EXPORTABLE_TYPE("upper bound; C"), NON_EXPORTABLE_TYPE("upper bound; I")!>T<!>> where T : C, T : I
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/localClassMetadata.txt b/compiler/testData/diagnostics/testsWithJsStdLib/localClassMetadata.txt
index 05713b910b5..eeb8d79f136 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/localClassMetadata.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/localClassMetadata.txt
@@ -35,8 +35,8 @@ public interface I {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <main> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/module/dualModuleFromUmd.txt b/compiler/testData/diagnostics/testsWithJsStdLib/module/dualModuleFromUmd.txt
index 055039202cb..85d6421e304 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/module/dualModuleFromUmd.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/module/dualModuleFromUmd.txt
@@ -1,9 +1,6 @@
+// -- Module: <m1> --
 package
 
-package bar {
-    public fun box(): kotlin.Unit
-}
-
 package foo {
 
     @kotlin.js.JsModule(import = "A") public external object A {
@@ -23,3 +20,11 @@ package foo {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
+// -- Module: <m2> --
+package
+
+package bar {
+    public fun box(): kotlin.Unit
+}
+
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.txt b/compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.txt
index 134c1212b98..09f71f4e104 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.txt
@@ -29,7 +29,6 @@ package foo {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -49,3 +48,4 @@ package bar {
 package foo {
     public external fun baz(): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.txt b/compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.txt
index 47320b9b0f3..b8c5d7e3ae1 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.txt
@@ -1,18 +1,6 @@
+// -- Module: <m1> --
 package
 
-package bar {
-    public inline fun </*0*/ reified T> boo(/*0*/ x: T): kotlin.Unit
-    public fun box(): kotlin.Unit
-
-    public final external class DerivedB : foo.B {
-        public constructor DerivedB()
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
-
 package foo {
     @kotlin.js.JsNonModule public external fun bar(): kotlin.Unit
 
@@ -40,3 +28,20 @@ package foo {
         }
     }
 }
+
+// -- Module: <m2> --
+package
+
+package bar {
+    public inline fun </*0*/ reified T> boo(/*0*/ x: T): kotlin.Unit
+    public fun box(): kotlin.Unit
+
+    public final external class DerivedB : foo.B {
+        public constructor DerivedB()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/name/illegalName.kt b/compiler/testData/diagnostics/testsWithJsStdLib/name/illegalName.kt
index d22f9aaa8d3..b6106c0fdab 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/name/illegalName.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/illegalName.kt
@@ -22,4 +22,4 @@ val x: Int
 fun box(x: dynamic) {
     x.<!NAME_CONTAINS_ILLEGAL_CHARS!>`foo-bar`<!>()
     x.<!NAME_CONTAINS_ILLEGAL_CHARS!>`ba-z`<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.kt
index 2a8be53e70f..fb4512bbb63 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.kt
@@ -6,4 +6,4 @@ inline fun A.foo(x: Int): String = asDynamic().foo(x)
 
 inline operator fun A.get(x: Int): String = asDynamic()[x]
 
-inline operator fun A.B.get(x: Int): String = asDynamic()[x]
\ No newline at end of file
+inline operator fun A.B.get(x: Int): String = asDynamic()[x]
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJsStdLibGenerated.java
similarity index 90%
rename from compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java
rename to compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJsStdLibGenerated.java
index c0b7f831644..1adc2e8c68c 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJsStdLibGenerated.java
@@ -3,14 +3,13 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.checkers;
+package org.jetbrains.kotlin.test.runners;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -19,1064 +18,1187 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib")
 @TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
 public class DiagnosticsTestWithJsStdLibGenerated extends AbstractDiagnosticsTestWithJsStdLib {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
+    @Test
     public void testAllFilesPresentInTestsWithJsStdLib() throws Exception {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
+    @Test
     @TestMetadata("funConstructorCallJS.kt")
     public void testFunConstructorCallJS() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithJsStdLib/funConstructorCallJS.kt");
     }
 
+    @Test
     @TestMetadata("implementingFunction.kt")
     public void testImplementingFunction() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithJsStdLib/implementingFunction.kt");
     }
 
+    @Test
     @TestMetadata("localClassMetadata.kt")
     public void testLocalClassMetadata() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithJsStdLib/localClassMetadata.kt");
     }
 
+    @Test
     @TestMetadata("noImpl.kt")
     public void testNoImpl() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithJsStdLib/noImpl.kt");
     }
 
+    @Test
     @TestMetadata("platformDependent.kt")
     public void testPlatformDependent() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithJsStdLib/platformDependent.kt");
     }
 
+    @Test
     @TestMetadata("runtimeAnnotations.kt")
     public void testRuntimeAnnotations() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithJsStdLib/runtimeAnnotations.kt");
     }
 
+    @Test
     @TestMetadata("unsafeCastFunctionOnDynamicType.kt")
     public void testUnsafeCastFunctionOnDynamicType() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithJsStdLib/unsafeCastFunctionOnDynamicType.kt");
     }
 
+    @Test
     @TestMetadata("wrongMultipleInheritance.kt")
     public void testWrongMultipleInheritance() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithJsStdLib/wrongMultipleInheritance.kt");
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/classLiteral")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class ClassLiteral extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class ClassLiteral extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInClassLiteral() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/classLiteral"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("arrays_after.kt")
         public void testArrays_after() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_after.kt");
         }
 
+        @Test
         @TestMetadata("arrays_before.kt")
         public void testArrays_before() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_before.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class DynamicTypes extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class DynamicTypes extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInDynamicTypes() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("allowedDynamicFunctionType.kt")
         public void testAllowedDynamicFunctionType() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/allowedDynamicFunctionType.kt");
         }
 
+        @Test
         @TestMetadata("assignment.kt")
         public void testAssignment() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/assignment.kt");
         }
 
+        @Test
         @TestMetadata("block.kt")
         public void testBlock() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt");
         }
 
+        @Test
         @TestMetadata("callableReferences.kt")
         public void testCallableReferences() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/callableReferences.kt");
         }
 
+        @Test
         @TestMetadata("capturedDynamic.kt")
         public void testCapturedDynamic() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/capturedDynamic.kt");
         }
 
+        @Test
         @TestMetadata("capturedDynamicNI.kt")
         public void testCapturedDynamicNI() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/capturedDynamicNI.kt");
         }
 
+        @Test
         @TestMetadata("classDelegateBy.kt")
         public void testClassDelegateBy() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/classDelegateBy.kt");
         }
 
+        @Test
         @TestMetadata("comparisonToNull.kt")
         public void testComparisonToNull() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/comparisonToNull.kt");
         }
 
+        @Test
         @TestMetadata("conditions.kt")
         public void testConditions() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conditions.kt");
         }
 
+        @Test
         @TestMetadata("conventions.kt")
         public void testConventions() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.kt");
         }
 
+        @Test
         @TestMetadata("destructuring.kt")
         public void testDestructuring() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/destructuring.kt");
         }
 
+        @Test
         @TestMetadata("dynamicCalls.kt")
         public void testDynamicCalls() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCalls.kt");
         }
 
+        @Test
         @TestMetadata("dynamicCallsWithLambdas.kt")
         public void testDynamicCallsWithLambdas() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.kt");
         }
 
+        @Test
         @TestMetadata("dynamicCastTarget.kt")
         public void testDynamicCastTarget() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.kt");
         }
 
+        @Test
         @TestMetadata("dynamicExtension.kt")
         public void testDynamicExtension() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicExtension.kt");
         }
 
+        @Test
         @TestMetadata("dynamicSafeCalls.kt")
         public void testDynamicSafeCalls() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicSafeCalls.kt");
         }
 
+        @Test
         @TestMetadata("dynamicVsGeneric.kt")
         public void testDynamicVsGeneric() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicVsGeneric.kt");
         }
 
+        @Test
         @TestMetadata("extensionVals.kt")
         public void testExtensionVals() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.kt");
         }
 
+        @Test
         @TestMetadata("extensionVars.kt")
         public void testExtensionVars() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt");
         }
 
+        @Test
         @TestMetadata("extensions.kt")
         public void testExtensions() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.kt");
         }
 
+        @Test
         @TestMetadata("extensionsToDynamic.kt")
         public void testExtensionsToDynamic() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt");
         }
 
+        @Test
         @TestMetadata("implicitDynamicReceiver.kt")
         public void testImplicitDynamicReceiver() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt");
         }
 
+        @Test
         @TestMetadata("inExpression.kt")
         public void testInExpression() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inExpression.kt");
         }
 
+        @Test
         @TestMetadata("indexedAccess.kt")
         public void testIndexedAccess() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/indexedAccess.kt");
         }
 
+        @Test
         @TestMetadata("inference.kt")
         public void testInference() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.kt");
         }
 
+        @Test
         @TestMetadata("membersOfAny.kt")
         public void testMembersOfAny() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/membersOfAny.kt");
         }
 
+        @Test
         @TestMetadata("namedArguments.kt")
         public void testNamedArguments() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt");
         }
 
+        @Test
         @TestMetadata("noUnsupportedInLocals.kt")
         public void testNoUnsupportedInLocals() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.kt");
         }
 
+        @Test
         @TestMetadata("nullable.kt")
         public void testNullable() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt");
         }
 
+        @Test
         @TestMetadata("overloading.kt")
         public void testOverloading() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.kt");
         }
 
+        @Test
         @TestMetadata("overloadingAmbiguity.kt")
         public void testOverloadingAmbiguity() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloadingAmbiguity.kt");
         }
 
+        @Test
         @TestMetadata("overrides.kt")
         public void testOverrides() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.kt");
         }
 
+        @Test
         @TestMetadata("propertyDelegateBy.kt")
         public void testPropertyDelegateBy() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/propertyDelegateBy.kt");
         }
 
+        @Test
         @TestMetadata("protected.kt")
         public void testProtected() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/protected.kt");
         }
 
+        @Test
         @TestMetadata("rangeExpression.kt")
         public void testRangeExpression() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/rangeExpression.kt");
         }
 
+        @Test
         @TestMetadata("reified.kt")
         public void testReified() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.kt");
         }
 
+        @Test
         @TestMetadata("smartCast.kt")
         public void testSmartCast() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/smartCast.kt");
         }
 
+        @Test
         @TestMetadata("spreadOperator.kt")
         public void testSpreadOperator() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/spreadOperator.kt");
         }
 
+        @Test
         @TestMetadata("staticCallsInDynamicContext.kt")
         public void testStaticCallsInDynamicContext() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/staticCallsInDynamicContext.kt");
         }
 
+        @Test
         @TestMetadata("staticExtensions.kt")
         public void testStaticExtensions() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/staticExtensions.kt");
         }
 
+        @Test
         @TestMetadata("substitution.kt")
         public void testSubstitution() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/substitution.kt");
         }
 
+        @Test
         @TestMetadata("supertypesAndBounds.kt")
         public void testSupertypesAndBounds() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.kt");
         }
 
+        @Test
         @TestMetadata("typealiasExpandingToDynamic.kt")
         public void testTypealiasExpandingToDynamic() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.kt");
         }
 
+        @Test
         @TestMetadata("typealiasWithAnnotatedDynamic.kt")
         public void testTypealiasWithAnnotatedDynamic() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithAnnotatedDynamic.kt");
         }
 
+        @Test
         @TestMetadata("typealiasWithDynamic.kt")
         public void testTypealiasWithDynamic() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasWithDynamic.kt");
         }
 
+        @Test
         @TestMetadata("varargs.kt")
         public void testVarargs() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/export")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Export extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class Export extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInExport() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/export"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("extendingNonExportedType.kt")
         public void testExtendingNonExportedType() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/export/extendingNonExportedType.kt");
         }
 
+        @Test
         @TestMetadata("jsExportOnNestedDeclarations.kt")
         public void testJsExportOnNestedDeclarations() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/export/jsExportOnNestedDeclarations.kt");
         }
 
+        @Test
         @TestMetadata("secondaryConstructorWithoutJsName.kt")
         public void testSecondaryConstructorWithoutJsName() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/export/secondaryConstructorWithoutJsName.kt");
         }
 
+        @Test
         @TestMetadata("unexportableTypesInSignature.kt")
         public void testUnexportableTypesInSignature() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInSignature.kt");
         }
 
+        @Test
         @TestMetadata("unexportableTypesInTypeParameters.kt")
         public void testUnexportableTypesInTypeParameters() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/export/unexportableTypesInTypeParameters.kt");
         }
 
+        @Test
         @TestMetadata("wrongExportedDeclaration.kt")
         public void testWrongExportedDeclaration() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/export/wrongExportedDeclaration.kt");
         }
 
+        @Test
         @TestMetadata("wrongExportedDeclarationInExportedFile.kt")
         public void testWrongExportedDeclarationInExportedFile() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/export/wrongExportedDeclarationInExportedFile.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/inline")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Inline extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class Inline extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInInline() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/inline"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("Reified.kt")
         public void testReified() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/inline/Reified.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class JsCode extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class JsCode extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInJsCode() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/jsCode"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("argumentIsLiteral.kt")
         public void testArgumentIsLiteral() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/argumentIsLiteral.kt");
         }
 
+        @Test
         @TestMetadata("badAssignment.kt")
         public void testBadAssignment() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/badAssignment.kt");
         }
 
+        @Test
         @TestMetadata("deleteOperation.kt")
         public void testDeleteOperation() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/deleteOperation.kt");
         }
 
+        @Test
         @TestMetadata("error.kt")
         public void testError() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.kt");
         }
 
+        @Test
         @TestMetadata("noJavaScriptProduced.kt")
         public void testNoJavaScriptProduced() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/noJavaScriptProduced.kt");
         }
 
+        @Test
         @TestMetadata("warning.kt")
         public void testWarning() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jvmDeclarations")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class JvmDeclarations extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class JvmDeclarations extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInJvmDeclarations() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/jvmDeclarations"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("cloneable.kt")
         public void testCloneable() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/jvmDeclarations/cloneable.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/module")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Module extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class Module extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInModule() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/module"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("dualModuleFromUmd.kt")
         public void testDualModuleFromUmd() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/module/dualModuleFromUmd.kt");
         }
 
+        @Test
         @TestMetadata("incompleteReifiedArg.kt")
         public void testIncompleteReifiedArg() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/module/incompleteReifiedArg.kt");
         }
 
+        @Test
         @TestMetadata("jsModuleNonExternal.kt")
         public void testJsModuleNonExternal() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/module/jsModuleNonExternal.kt");
         }
 
+        @Test
         @TestMetadata("jsModuleWithoutParameters.kt")
         public void testJsModuleWithoutParameters() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/module/jsModuleWithoutParameters.kt");
         }
 
+        @Test
         @TestMetadata("jsVarProhibited.kt")
         public void testJsVarProhibited() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/module/jsVarProhibited.kt");
         }
 
+        @Test
         @TestMetadata("nestedProhibited.kt")
         public void testNestedProhibited() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/module/nestedProhibited.kt");
         }
 
+        @Test
         @TestMetadata("prohibitedOnNonNative.kt")
         public void testProhibitedOnNonNative() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/module/prohibitedOnNonNative.kt");
         }
 
+        @Test
         @TestMetadata("wrongCallToModule.kt")
         public void testWrongCallToModule() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToModule.kt");
         }
 
+        @Test
         @TestMetadata("wrongCallToNonModule.kt")
         public void testWrongCallToNonModule() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/name")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Name extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class Name extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInName() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/name"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("bridgeClash.kt")
         public void testBridgeClash() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/bridgeClash.kt");
         }
 
+        @Test
         @TestMetadata("builtinClash.kt")
         public void testBuiltinClash() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/builtinClash.kt");
         }
 
+        @Test
         @TestMetadata("classAndFunction.kt")
         public void testClassAndFunction() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/classAndFunction.kt");
         }
 
+        @Test
         @TestMetadata("classAndTypealias.kt")
         public void testClassAndTypealias() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/classAndTypealias.kt");
         }
 
+        @Test
         @TestMetadata("classLevelMethodAndProperty.kt")
         public void testClassLevelMethodAndProperty() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/classLevelMethodAndProperty.kt");
         }
 
+        @Test
         @TestMetadata("conflictingNamesFromSuperclass.kt")
         public void testConflictingNamesFromSuperclass() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/conflictingNamesFromSuperclass.kt");
         }
 
+        @Test
         @TestMetadata("declarationClash.kt")
         public void testDeclarationClash() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/declarationClash.kt");
         }
 
+        @Test
         @TestMetadata("extensionPropertyAndMethod.kt")
         public void testExtensionPropertyAndMethod() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/extensionPropertyAndMethod.kt");
         }
 
+        @Test
         @TestMetadata("illegalName.kt")
         public void testIllegalName() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/illegalName.kt");
         }
 
+        @Test
         @TestMetadata("illegalPackageName.kt")
         public void testIllegalPackageName() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/illegalPackageName.kt");
         }
 
+        @Test
         @TestMetadata("jsNameAndOverridden.kt")
         public void testJsNameAndOverridden() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameAndOverridden.kt");
         }
 
+        @Test
         @TestMetadata("jsNameClash.kt")
         public void testJsNameClash() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameClash.kt");
         }
 
+        @Test
         @TestMetadata("jsNameClashWithDefault.kt")
         public void testJsNameClashWithDefault() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameClashWithDefault.kt");
         }
 
+        @Test
         @TestMetadata("jsNameMissingOnAccessors.kt")
         public void testJsNameMissingOnAccessors() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.kt");
         }
 
+        @Test
         @TestMetadata("jsNameOnAccessors.kt")
         public void testJsNameOnAccessors() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnAccessors.kt");
         }
 
+        @Test
         @TestMetadata("jsNameOnOverride.kt")
         public void testJsNameOnOverride() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnOverride.kt");
         }
 
+        @Test
         @TestMetadata("jsNameOnPropertyAndAccessor.kt")
         public void testJsNameOnPropertyAndAccessor() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.kt");
         }
 
+        @Test
         @TestMetadata("jsNamePrihibitedOnPrimaryConstructor.kt")
         public void testJsNamePrihibitedOnPrimaryConstructor() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNamePrihibitedOnPrimaryConstructor.kt");
         }
 
+        @Test
         @TestMetadata("jsNameProhibitedOnExtensionProperty.kt")
         public void testJsNameProhibitedOnExtensionProperty() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameProhibitedOnExtensionProperty.kt");
         }
 
+        @Test
         @TestMetadata("jsNameUseTargetOnProperty.kt")
         public void testJsNameUseTargetOnProperty() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameUseTargetOnProperty.kt");
         }
 
+        @Test
         @TestMetadata("jsNameWithoutParameter.kt")
         public void testJsNameWithoutParameter() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameWithoutParameter.kt");
         }
 
+        @Test
         @TestMetadata("methodAndMethod.kt")
         public void testMethodAndMethod() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/methodAndMethod.kt");
         }
 
+        @Test
         @TestMetadata("nameSwapInOverride.kt")
         public void testNameSwapInOverride() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/nameSwapInOverride.kt");
         }
 
+        @Test
         @TestMetadata("overrideOverloadedNativeFunction.kt")
         public void testOverrideOverloadedNativeFunction() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/overrideOverloadedNativeFunction.kt");
         }
 
+        @Test
         @TestMetadata("packageAndMethod.kt")
         public void testPackageAndMethod() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/packageAndMethod.kt");
         }
 
+        @Test
         @TestMetadata("packageAndProperty.kt")
         public void testPackageAndProperty() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/packageAndProperty.kt");
         }
 
+        @Test
         @TestMetadata("privateJsNameClash.kt")
         public void testPrivateJsNameClash() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/privateJsNameClash.kt");
         }
 
+        @Test
         @TestMetadata("propertyAndMethodInImplementor.kt")
         public void testPropertyAndMethodInImplementor() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInImplementor.kt");
         }
 
+        @Test
         @TestMetadata("propertyAndMethodInSubclass.kt")
         public void testPropertyAndMethodInSubclass() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInSubclass.kt");
         }
 
+        @Test
         @TestMetadata("topLevelMethodAndJsNameConstructor.kt")
         public void testTopLevelMethodAndJsNameConstructor() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/topLevelMethodAndJsNameConstructor.kt");
         }
 
+        @Test
         @TestMetadata("topLevelMethodAndProperty.kt")
         public void testTopLevelMethodAndProperty() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/name/topLevelMethodAndProperty.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Native extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class Native extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInNative() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("anonymousInitializer.kt")
         public void testAnonymousInitializer() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/anonymousInitializer.kt");
         }
 
+        @Test
         @TestMetadata("body.kt")
         public void testBody() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/body.kt");
         }
 
+        @Test
         @TestMetadata("delegatedConstructorCall.kt")
         public void testDelegatedConstructorCall() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/delegatedConstructorCall.kt");
         }
 
+        @Test
         @TestMetadata("delegation.kt")
         public void testDelegation() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/delegation.kt");
         }
 
+        @Test
         @TestMetadata("enumEntry.kt")
         public void testEnumEntry() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/enumEntry.kt");
         }
 
+        @Test
         @TestMetadata("extensionFunctionAndProperty.kt")
         public void testExtensionFunctionAndProperty() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/extensionFunctionAndProperty.kt");
         }
 
+        @Test
         @TestMetadata("extensionFunctionArgumentOrReturnType.kt")
         public void testExtensionFunctionArgumentOrReturnType() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/extensionFunctionArgumentOrReturnType.kt");
         }
 
+        @Test
         @TestMetadata("externalFunInterface.kt")
         public void testExternalFunInterface() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/externalFunInterface.kt");
         }
 
+        @Test
         @TestMetadata("externalInterfaceNested.kt")
         public void testExternalInterfaceNested() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/externalInterfaceNested.kt");
         }
 
+        @Test
         @TestMetadata("inheritance.kt")
         public void testInheritance() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/inheritance.kt");
         }
 
+        @Test
         @TestMetadata("inline.kt")
         public void testInline() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/inline.kt");
         }
 
+        @Test
         @TestMetadata("inlineClass.kt")
         public void testInlineClass() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/inlineClass.kt");
         }
 
+        @Test
         @TestMetadata("inlineClassAsParameterOrReturnType.kt.kt")
         public void testInlineClassAsParameterOrReturnType_kt() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/inlineClassAsParameterOrReturnType.kt.kt");
         }
 
+        @Test
         @TestMetadata("inlineExtensionToNative.kt")
         public void testInlineExtensionToNative() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.kt");
         }
 
+        @Test
         @TestMetadata("innerClass.kt")
         public void testInnerClass() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/innerClass.kt");
         }
 
+        @Test
         @TestMetadata("nested.kt")
         public void testNested() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nested.kt");
         }
 
+        @Test
         @TestMetadata("nonAbstractMembersOfInterface.kt")
         public void testNonAbstractMembersOfInterface() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nonAbstractMembersOfInterface.kt");
         }
 
+        @Test
         @TestMetadata("overrideOptionalParam.kt")
         public void testOverrideOptionalParam() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/overrideOptionalParam.kt");
         }
 
+        @Test
         @TestMetadata("privateMembers.kt")
         public void testPrivateMembers() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/privateMembers.kt");
         }
 
+        @Test
         @TestMetadata("propertyParameter.kt")
         public void testPropertyParameter() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/propertyParameter.kt");
         }
 
+        @Test
         @TestMetadata("wrongTarget.kt")
         public void testWrongTarget() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/wrongTarget.kt");
         }
 
+        @Nested
         @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class NativeGetter extends AbstractDiagnosticsTestWithJsStdLib {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
+        public class NativeGetter extends AbstractDiagnosticsTestWithJsStdLib {
+            @Test
             public void testAllFilesPresentInNativeGetter() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
+            @Test
             @TestMetadata("onLocalExtensionFun.kt")
             public void testOnLocalExtensionFun() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalExtensionFun.kt");
             }
 
+            @Test
             @TestMetadata("onLocalNonNativeClassMembers.kt")
             public void testOnLocalNonNativeClassMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalNonNativeClassMembers.kt");
             }
 
+            @Test
             @TestMetadata("onLocalOtherDeclarations.kt")
             public void testOnLocalOtherDeclarations() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalOtherDeclarations.kt");
             }
 
+            @Test
             @TestMetadata("onNativeClassMembers.kt")
             public void testOnNativeClassMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.kt");
             }
 
+            @Test
             @TestMetadata("onNestedDeclarationsInsideNativeClass.kt")
             public void testOnNestedDeclarationsInsideNativeClass() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.kt");
             }
 
+            @Test
             @TestMetadata("onNestedDeclarationsInsideNonNativeClass.kt")
             public void testOnNestedDeclarationsInsideNonNativeClass() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.kt");
             }
 
+            @Test
             @TestMetadata("onNonNativeClassMembers.kt")
             public void testOnNonNativeClassMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.kt");
             }
 
+            @Test
             @TestMetadata("onToplevelExtensionFun.kt")
             public void testOnToplevelExtensionFun() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelExtensionFun.kt");
             }
 
+            @Test
             @TestMetadata("onToplevelOtherDeclarations.kt")
             public void testOnToplevelOtherDeclarations() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelOtherDeclarations.kt");
             }
         }
 
+        @Nested
         @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class NativeInvoke extends AbstractDiagnosticsTestWithJsStdLib {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
+        public class NativeInvoke extends AbstractDiagnosticsTestWithJsStdLib {
+            @Test
             public void testAllFilesPresentInNativeInvoke() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
+            @Test
             @TestMetadata("onLocalExtensionFun.kt")
             public void testOnLocalExtensionFun() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalExtensionFun.kt");
             }
 
+            @Test
             @TestMetadata("onLocalNonNativeClassMembers.kt")
             public void testOnLocalNonNativeClassMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalNonNativeClassMembers.kt");
             }
 
+            @Test
             @TestMetadata("onLocalOtherDeclarations.kt")
             public void testOnLocalOtherDeclarations() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalOtherDeclarations.kt");
             }
 
+            @Test
             @TestMetadata("onNativeClassMembers.kt")
             public void testOnNativeClassMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.kt");
             }
 
+            @Test
             @TestMetadata("onNestedDeclarationsInsideNativeClass.kt")
             public void testOnNestedDeclarationsInsideNativeClass() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.kt");
             }
 
+            @Test
             @TestMetadata("onNestedDeclarationsInsideNonNativeClass.kt")
             public void testOnNestedDeclarationsInsideNonNativeClass() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.kt");
             }
 
+            @Test
             @TestMetadata("onNonNativeClassMembers.kt")
             public void testOnNonNativeClassMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.kt");
             }
 
+            @Test
             @TestMetadata("onToplevelExtensionFun.kt")
             public void testOnToplevelExtensionFun() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelExtensionFun.kt");
             }
 
+            @Test
             @TestMetadata("onToplevelOtherDeclarations.kt")
             public void testOnToplevelOtherDeclarations() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelOtherDeclarations.kt");
             }
         }
 
+        @Nested
         @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class NativeSetter extends AbstractDiagnosticsTestWithJsStdLib {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
+        public class NativeSetter extends AbstractDiagnosticsTestWithJsStdLib {
+            @Test
             public void testAllFilesPresentInNativeSetter() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
+            @Test
             @TestMetadata("onLocalExtensionFun.kt")
             public void testOnLocalExtensionFun() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalExtensionFun.kt");
             }
 
+            @Test
             @TestMetadata("onLocalNonNativeClassMembers.kt")
             public void testOnLocalNonNativeClassMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalNonNativeClassMembers.kt");
             }
 
+            @Test
             @TestMetadata("onLocalOtherDeclarations.kt")
             public void testOnLocalOtherDeclarations() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalOtherDeclarations.kt");
             }
 
+            @Test
             @TestMetadata("onNativeClassMembers.kt")
             public void testOnNativeClassMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.kt");
             }
 
+            @Test
             @TestMetadata("onNestedDeclarationsInsideNativeClass.kt")
             public void testOnNestedDeclarationsInsideNativeClass() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.kt");
             }
 
+            @Test
             @TestMetadata("onNestedDeclarationsInsideNonNativeClass.kt")
             public void testOnNestedDeclarationsInsideNonNativeClass() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.kt");
             }
 
+            @Test
             @TestMetadata("onNonNativeClassMembers.kt")
             public void testOnNonNativeClassMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.kt");
             }
 
+            @Test
             @TestMetadata("onToplevelExtensionFun.kt")
             public void testOnToplevelExtensionFun() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.kt");
             }
 
+            @Test
             @TestMetadata("onToplevelOtherDeclarations.kt")
             public void testOnToplevelOtherDeclarations() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelOtherDeclarations.kt");
             }
         }
 
+        @Nested
         @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class OptionlBody extends AbstractDiagnosticsTestWithJsStdLib {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
+        public class OptionlBody extends AbstractDiagnosticsTestWithJsStdLib {
+            @Test
             public void testAllFilesPresentInOptionlBody() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
+            @Test
             @TestMetadata("native.kt")
             public void testNative() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt");
             }
 
+            @Test
             @TestMetadata("nativeGetter.kt")
             public void testNativeGetter() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.kt");
             }
 
+            @Test
             @TestMetadata("nativeInvoke.kt")
             public void testNativeInvoke() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeInvoke.kt");
             }
 
+            @Test
             @TestMetadata("nativeSetter.kt")
             public void testNativeSetter() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeSetter.kt");
             }
         }
 
+        @Nested
         @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/rtti")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Rtti extends AbstractDiagnosticsTestWithJsStdLib {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
+        public class Rtti extends AbstractDiagnosticsTestWithJsStdLib {
+            @Test
             public void testAllFilesPresentInRtti() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/rtti"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
+            @Test
             @TestMetadata("castToNativeInterface.kt")
             public void testCastToNativeInterface() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/castToNativeInterface.kt");
             }
 
+            @Test
             @TestMetadata("checkForNativeInterface.kt")
             public void testCheckForNativeInterface() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/checkForNativeInterface.kt");
             }
 
+            @Test
             @TestMetadata("nativeInterfaceAsReifiedTypeArgument.kt")
             public void testNativeInterfaceAsReifiedTypeArgument() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.kt");
             }
 
+            @Test
             @TestMetadata("nativeInterfaceClassLiteral.kt")
             public void testNativeInterfaceClassLiteral() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceClassLiteral.kt");
             }
 
+            @Test
             @TestMetadata("whenIsNativeInterface.kt")
             public void testWhenIsNativeInterface() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/whenIsNativeInterface.kt");
             }
         }
 
+        @Nested
         @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class UnusedParam extends AbstractDiagnosticsTestWithJsStdLib {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
+        public class UnusedParam extends AbstractDiagnosticsTestWithJsStdLib {
+            @Test
             public void testAllFilesPresentInUnusedParam() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
+            @Test
             @TestMetadata("native.kt")
             public void testNative() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/native.kt");
             }
 
+            @Test
             @TestMetadata("nativeGetter.kt")
             public void testNativeGetter() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeGetter.kt");
             }
 
+            @Test
             @TestMetadata("nativeInvoke.kt")
             public void testNativeInvoke() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeInvoke.kt");
             }
 
+            @Test
             @TestMetadata("nativeSetter.kt")
             public void testNativeSetter() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeSetter.kt");
@@ -1084,41 +1206,38 @@ public class DiagnosticsTestWithJsStdLibGenerated extends AbstractDiagnosticsTes
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/qualifier")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Qualifier extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class Qualifier extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInQualifier() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/qualifier"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("jsQualifierNonExternal.kt")
         public void testJsQualifierNonExternal() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/qualifier/jsQualifierNonExternal.kt");
         }
 
+        @Test
         @TestMetadata("wrongQualifier.kt")
         public void testWrongQualifier() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/qualifier/wrongQualifier.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/reflection")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Reflection extends AbstractDiagnosticsTestWithJsStdLib {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
+    public class Reflection extends AbstractDiagnosticsTestWithJsStdLib {
+        @Test
         public void testAllFilesPresentInReflection() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/reflection"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
+        @Test
         @TestMetadata("reflectionApi.kt")
         public void testReflectionApi() throws Exception {
             runTest("compiler/testData/diagnostics/testsWithJsStdLib/reflection/reflectionApi.kt");
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DynamicCallsDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DynamicCallsDumpHandler.kt
new file mode 100644
index 00000000000..5450174adb1
--- /dev/null
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DynamicCallsDumpHandler.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.test.frontend.classic.handlers
+
+import org.jetbrains.kotlin.checkers.CheckerDebugInfoReporter
+import org.jetbrains.kotlin.checkers.utils.DebugInfoUtil
+import org.jetbrains.kotlin.config.LanguageFeature
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives
+import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
+import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact
+import org.jetbrains.kotlin.test.model.TestModule
+import org.jetbrains.kotlin.test.services.TestServices
+import org.jetbrains.kotlin.test.services.moduleStructure
+import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator
+import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.RECURSIVE_ALL
+import org.jetbrains.kotlin.test.utils.MultiModuleInfoDumper
+import org.jetbrains.kotlin.test.utils.MultiModuleInfoDumperImpl
+import org.jetbrains.kotlin.test.utils.withExtension
+
+class DynamicCallsDumpHandler(testServices: TestServices) : ClassicFrontendAnalysisHandler(testServices) {
+    companion object {
+        private const val DYNAMIC_PREFIX = ".dynamic.txt"
+    }
+
+    override val directivesContainers: List<DirectivesContainer>
+        get() = listOf(DiagnosticsDirectives)
+
+    private val dumper: MultiModuleInfoDumper = MultiModuleInfoDumperImpl(moduleHeaderTemplate = "// -- Module: <%s> --")
+
+    override fun processModule(module: TestModule, info: ClassicFrontendOutputArtifact) {
+        val dynamicCallDescriptors = mutableListOf<DeclarationDescriptor>()
+        for (ktFile in info.ktFiles.values) {
+            DebugInfoUtil.markDebugAnnotations(
+                ktFile,
+                info.analysisResult.bindingContext,
+                CheckerDebugInfoReporter(
+                    dynamicCallDescriptors,
+                    markDynamicCalls = true,
+                    debugAnnotations = mutableListOf(),
+                    withNewInference = info.languageVersionSettings.supportsFeature(LanguageFeature.NewInference),
+                    platform = null
+                )
+            )
+        }
+        val serializer = RecursiveDescriptorComparator(RECURSIVE_ALL)
+        val builder = dumper.builderForModule(module)
+        for (descriptor in dynamicCallDescriptors) {
+            builder.append(serializer.serializeRecursively(descriptor))
+        }
+    }
+
+    override fun processAfterAllModules(someAssertionWasFailed: Boolean) {
+        if (dumper.isEmpty()) return
+        val expectedFile = testServices.moduleStructure.originalTestDataFiles.first().withExtension(DYNAMIC_PREFIX)
+        if (expectedFile.exists()) {
+            val resultDump = dumper.generateResultingDump()
+            assertions.assertEqualsToFile(expectedFile, resultDump)
+        }
+    }
+}
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt
index b6c7372d5a3..6b2106958a1 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt
@@ -26,6 +26,10 @@ fun main(args: Array<String>) {
                 model("diagnostics/tests", excludedPattern = excludedFirTestdataPattern)
                 model("diagnostics/testsWithStdLib", excludedPattern = excludedFirTestdataPattern)
             }
+
+            testClass<AbstractDiagnosticsTestWithJsStdLib> {
+                model("diagnostics/testsWithJsStdLib")
+            }
         }
 
         testGroup("compiler/tests-common-new/tests-gen", "compiler/fir/analysis-tests/testData") {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJsStdLib.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJsStdLib.kt
new file mode 100644
index 00000000000..54f38b3542b
--- /dev/null
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsTestWithJsStdLib.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.test.runners
+
+import org.jetbrains.kotlin.platform.js.JsPlatforms
+import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
+import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
+import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler
+import org.jetbrains.kotlin.test.frontend.classic.handlers.DeclarationsDumpHandler
+import org.jetbrains.kotlin.test.frontend.classic.handlers.DynamicCallsDumpHandler
+import org.jetbrains.kotlin.test.frontend.classic.handlers.OldNewInferenceMetaInfoProcessor
+import org.jetbrains.kotlin.test.model.BackendKind
+import org.jetbrains.kotlin.test.model.DependencyKind
+import org.jetbrains.kotlin.test.model.FrontendKinds
+import org.jetbrains.kotlin.test.services.AdditionalDiagnosticsSourceFilesProvider
+import org.jetbrains.kotlin.test.services.CoroutineHelpersSourceFilesProvider
+import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator
+
+abstract class AbstractDiagnosticsTestWithJsStdLib : AbstractKotlinCompilerTest() {
+    override fun TestConfigurationBuilder.configuration() {
+        globalDefaults {
+            frontend = FrontendKinds.ClassicFrontend
+            backend = BackendKind.NoBackend
+            targetPlatform = JsPlatforms.defaultJsPlatform
+            dependencyKind = DependencyKind.Source
+        }
+
+        defaultDirectives {
+            +JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING
+        }
+
+        enableMetaInfoHandler()
+
+        useConfigurators(::JsEnvironmentConfigurator,)
+
+        useMetaInfoProcessors(::OldNewInferenceMetaInfoProcessor)
+        useAdditionalSourceProviders(
+            ::AdditionalDiagnosticsSourceFilesProvider,
+            ::CoroutineHelpersSourceFilesProvider,
+        )
+
+        useFrontendFacades(::ClassicFrontendFacade)
+        useFrontendHandlers(
+            ::DeclarationsDumpHandler,
+            ::ClassicDiagnosticsHandler,
+            ::DynamicCallsDumpHandler,
+        )
+    }
+}
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FileUtils.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FileUtils.kt
index 89e1a6442b2..3a881490d4e 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FileUtils.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FileUtils.kt
@@ -26,3 +26,9 @@ val File.firTestDataFile: File
     } else {
         parentFile.resolve("${name.removeSuffix(KT)}$FIR_KT")
     }
+
+fun File.withExtension(extension: String): File {
+    @Suppress("NAME_SHADOWING")
+    val extension = extension.removePrefix(".")
+    return parentFile.resolve("$nameWithoutExtension.$extension")
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
index 054895e8556..3e5577872e0 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
@@ -67,10 +67,6 @@ fun main(args: Array<String>) {
 
     generateTestGroupSuite(args) {
         testGroup("compiler/tests-gen", "compiler/testData") {
-            testClass<AbstractDiagnosticsTestWithJsStdLib> {
-                model("diagnostics/testsWithJsStdLib")
-            }
-
             testClass<AbstractDiagnosticsTestWithJsStdLibAndBackendCompilation> {
                 model("diagnostics/testsWithJsStdLibAndBackendCompilation")
             }