diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/unsupported.kt b/compiler/testData/diagnostics/tests/dynamicTypes/unsupported.kt
index 11978b9846e..fa395b3a7c6 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/unsupported.kt
+++ b/compiler/testData/diagnostics/tests/dynamicTypes/unsupported.kt
@@ -1,6 +1,3 @@
-// MODULE[jvm]: m1
-// FILE: k.kt
-
 val foo: <!UNSUPPORTED!>dynamic<!> = 1
 
 fun foo() {
@@ -8,14 +5,3 @@ fun foo() {
         val foo: <!UNSUPPORTED!>dynamic<!> = 1
     }
 }
-
-// MODULE[js]: m2
-// FILE: k.kt
-
-val foo: dynamic = 1
-
-fun foo() {
-    class C {
-        val foo: dynamic = 1
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/unsupported.txt b/compiler/testData/diagnostics/tests/dynamicTypes/unsupported.txt
index 7c82f932956..5cc9b2bb266 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/unsupported.txt
+++ b/compiler/testData/diagnostics/tests/dynamicTypes/unsupported.txt
@@ -1,14 +1,4 @@
-// -- Module: <m1> --
 package
 
 internal val foo: dynamic = 1
 internal fun foo(): kotlin.Unit
-
-
-// -- Module: <m2> --
-package
-
-internal val foo: dynamic = 1
-internal fun foo(): kotlin.Unit
-
-
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/assignment.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/assignment.kt
similarity index 81%
rename from compiler/testData/diagnostics/tests/dynamicTypes/assignment.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/assignment.kt
index 6abd3d49c09..127d0f14e96 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/assignment.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/assignment.kt
@@ -1,9 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // !CHECK_TYPE
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun foo(d: dynamic) {
     val s: String = d
     val d1: dynamic = ""
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/assignment.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/assignment.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/assignment.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/assignment.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/block.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt
similarity index 88%
rename from compiler/testData/diagnostics/tests/dynamicTypes/block.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt
index ca53df7e80d..e477e6d5dd6 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/block.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun foo() {
     dynamic {
         <!DEBUG_INFO_DYNAMIC!>foo<!>()
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/block.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/block.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/callableReferences.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/callableReferences.kt
similarity index 80%
rename from compiler/testData/diagnostics/tests/dynamicTypes/callableReferences.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/callableReferences.kt
index c2c85270a3b..3f76efaea35 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/callableReferences.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/callableReferences.kt
@@ -1,8 +1,5 @@
 // !DIAGNOSTICS: -REFLECTION_TYPES_NOT_LOADED -UNUSED_EXPRESSION
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test() {
     dynamic::foo
 }
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/callableReferences.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/callableReferences.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/callableReferences.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/callableReferences.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/conditions.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conditions.kt
similarity index 84%
rename from compiler/testData/diagnostics/tests/dynamicTypes/conditions.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conditions.kt
index 5e63620068c..ca5eb0f9b09 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/conditions.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conditions.kt
@@ -1,6 +1,3 @@
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic, b: Boolean?) {
     if (d) {}
     while (d) {}
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/conditions.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conditions.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/conditions.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conditions.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/conventions.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.kt
similarity index 98%
rename from compiler/testData/diagnostics/tests/dynamicTypes/conventions.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.kt
index 584c2cce131..3e8da89b815 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/conventions.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     <!DEBUG_INFO_DYNAMIC!>+<!>d
     <!DEBUG_INFO_DYNAMIC!>-<!>d
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/conventions.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/conventions.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicCalls.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCalls.kt
similarity index 93%
rename from compiler/testData/diagnostics/tests/dynamicTypes/dynamicCalls.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCalls.kt
index e87f6e4fa3a..39e8566d926 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicCalls.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCalls.kt
@@ -1,6 +1,3 @@
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     val v1 = d.foo()
     v1.isDynamic() // to check that anything is resolvable
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicCalls.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCalls.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/dynamicCalls.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCalls.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicCallsWithLambdas.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.kt
similarity index 90%
rename from compiler/testData/diagnostics/tests/dynamicTypes/dynamicCallsWithLambdas.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.kt
index fded5ea995a..c411fcd103b 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicCallsWithLambdas.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.kt
@@ -1,6 +1,3 @@
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     d.foo {}
 
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicCallsWithLambdas.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/dynamicCallsWithLambdas.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicCastTarget.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.kt
similarity index 95%
rename from compiler/testData/diagnostics/tests/dynamicTypes/dynamicCastTarget.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.kt
index 7d89f605786..07aaa59629a 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicCastTarget.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.kt
@@ -1,8 +1,5 @@
 // !DIAGNOSTICS: -REDUNDANT_NULLABLE
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: Any, dl: Collection<dynamic>) {
     d as <!DYNAMIC_NOT_ALLOWED!>dynamic<!>
     d as <!DYNAMIC_NOT_ALLOWED!>dynamic?<!>
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicCastTarget.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/dynamicCastTarget.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicSafeCalls.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicSafeCalls.kt
similarity index 85%
rename from compiler/testData/diagnostics/tests/dynamicTypes/dynamicSafeCalls.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicSafeCalls.kt
index fe3a4bb1217..33c373de5b6 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicSafeCalls.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicSafeCalls.kt
@@ -1,6 +1,3 @@
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     val v1 = d?.foo()
     v1.isDynamic() // to check that anything is resolvable
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/dynamicSafeCalls.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicSafeCalls.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/dynamicSafeCalls.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicSafeCalls.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/extensionVals.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.kt
similarity index 97%
rename from compiler/testData/diagnostics/tests/dynamicTypes/extensionVals.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.kt
index 2e63d78900b..c43fe713db5 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/extensionVals.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     d.<!DEBUG_INFO_DYNAMIC!>onAnyVal<!>
     d.<!DEBUG_INFO_DYNAMIC!>onAnyVal<!> = 1
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/extensionVals.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/extensionVals.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/extensionVars.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt
similarity index 97%
rename from compiler/testData/diagnostics/tests/dynamicTypes/extensionVars.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt
index c7b499a984b..dfb64ef49fc 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/extensionVars.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     d.<!DEBUG_INFO_DYNAMIC!>onAnyVar<!>
     d.<!DEBUG_INFO_DYNAMIC!>onAnyVar<!> = 1
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/extensionVars.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/extensionVars.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/extensions.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.kt
similarity index 95%
rename from compiler/testData/diagnostics/tests/dynamicTypes/extensions.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.kt
index 79e1cdf8513..18c10749572 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/extensions.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     d.<!DEBUG_INFO_DYNAMIC!>onAny<!>()
     d?.<!DEBUG_INFO_DYNAMIC!>onAny<!>()
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/extensions.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/extensions.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/extensionsToDynamic.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt
similarity index 96%
rename from compiler/testData/diagnostics/tests/dynamicTypes/extensionsToDynamic.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt
index 687c32bd724..1d22a524268 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/extensionsToDynamic.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     d.onDynamic()
     d.onNullableDynamic()
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/extensionsToDynamic.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/extensionsToDynamic.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/implicitDynamicReceiver.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt
similarity index 93%
rename from compiler/testData/diagnostics/tests/dynamicTypes/implicitDynamicReceiver.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt
index 97013124fb5..c7baa5706b6 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/implicitDynamicReceiver.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt
@@ -1,6 +1,3 @@
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun dynamic.test() {
     val v1 = foo()
     v1.isDynamic() // to check that anything is resolvable
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/implicitDynamicReceiver.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/implicitDynamicReceiver.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/inference.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.kt
similarity index 94%
rename from compiler/testData/diagnostics/tests/dynamicTypes/inference.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.kt
index f1c1405f3e4..894e20bb58b 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/inference.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.kt
@@ -1,9 +1,6 @@
 // !MARK_DYNAMIC_CALLS
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun <T> foo(t1: T, t2: T): T = t1
 
 trait Tr
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/inference.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/inference.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/membersOfAny.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/membersOfAny.kt
similarity index 87%
rename from compiler/testData/diagnostics/tests/dynamicTypes/membersOfAny.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/membersOfAny.kt
index bf86b574495..361106b1a48 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/membersOfAny.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/membersOfAny.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     d == 1
 
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/membersOfAny.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/membersOfAny.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/membersOfAny.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/membersOfAny.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/namedArguments.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt
similarity index 84%
rename from compiler/testData/diagnostics/tests/dynamicTypes/namedArguments.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt
index 450e77361e3..c799a2084a0 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/namedArguments.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt
@@ -1,6 +1,3 @@
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test(d: dynamic) {
     d.foo(name = "name")
 
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/namedArguments.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/namedArguments.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.txt
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.kt
new file mode 100644
index 00000000000..e6b5f154919
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.kt
@@ -0,0 +1,7 @@
+val foo: dynamic = 1
+
+fun foo() {
+    class C {
+        val foo: dynamic = 1
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.txt
new file mode 100644
index 00000000000..5cc9b2bb266
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.txt
@@ -0,0 +1,4 @@
+package
+
+internal val foo: dynamic = 1
+internal fun foo(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/nullable.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt
similarity index 90%
rename from compiler/testData/diagnostics/tests/dynamicTypes/nullable.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt
index a91f9b2286f..b217529b22a 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/nullable.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt
@@ -1,8 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun foo(dn: dynamic<!REDUNDANT_NULLABLE!>?<!>, d: dynamic, dnn: dynamic<!REDUNDANT_NULLABLE!>?<!><!REDUNDANT_NULLABLE!>?<!>) {
     val a1 = dn.foo()
     a1.isDynamic()
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/nullable.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/nullable.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/overloading.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.kt
similarity index 94%
rename from compiler/testData/diagnostics/tests/dynamicTypes/overloading.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.kt
index 35f33166c31..eb0e726e5bc 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/overloading.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.kt
@@ -1,9 +1,6 @@
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun dyn(d: dynamic) {}
 
 fun foo(d: dynamic): String = ""
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/overloading.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/overloading.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/overloadingAmbiguity.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloadingAmbiguity.kt
similarity index 89%
rename from compiler/testData/diagnostics/tests/dynamicTypes/overloadingAmbiguity.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloadingAmbiguity.kt
index 983e596a56e..99086046eba 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/overloadingAmbiguity.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloadingAmbiguity.kt
@@ -1,9 +1,6 @@
 // !MARK_DYNAMIC_CALLS
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun dynamic.foo(s: String, a: Any) {}
 fun dynamic.foo(s: Any, a: String) {}
 
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/overloadingAmbiguity.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloadingAmbiguity.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/overloadingAmbiguity.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloadingAmbiguity.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/overrides.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.kt
similarity index 88%
rename from compiler/testData/diagnostics/tests/dynamicTypes/overrides.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.kt
index 9a4353157d4..d372b4a2b58 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/overrides.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.kt
@@ -1,6 +1,3 @@
-// MODULE[js]: m1
-// FILE: k.kt
-
 trait P
 trait R
 
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/overrides.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/overrides.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/reified.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.kt
similarity index 91%
rename from compiler/testData/diagnostics/tests/dynamicTypes/reified.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.kt
index 2bdb3feb1a8..2f0513f6bdb 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/reified.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.kt
@@ -1,8 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun <reified T> foo(t: T) {}
 class C<reified T>(t: T)
 
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/reified.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/reified.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/smartCast.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/smartCast.kt
similarity index 84%
rename from compiler/testData/diagnostics/tests/dynamicTypes/smartCast.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/smartCast.kt
index 33a57381092..bca56453688 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/smartCast.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/smartCast.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun foo(d: dynamic) {
     if (d is Foo) {
         d.bar() // resolved statically
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/smartCast.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/smartCast.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/smartCast.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/smartCast.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/substitution.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/substitution.kt
similarity index 77%
rename from compiler/testData/diagnostics/tests/dynamicTypes/substitution.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/substitution.kt
index 80a781f96a4..d42d6128ff8 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/substitution.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/substitution.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun foo(d: dynamic) {
     Foo(d).p.<!DEBUG_INFO_DYNAMIC!>bar<!>()
 
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/substitution.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/substitution.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/substitution.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/substitution.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/supertypesAndBounds.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.kt
similarity index 82%
rename from compiler/testData/diagnostics/tests/dynamicTypes/supertypesAndBounds.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.kt
index 8e4a0c6dae8..267e111d84e 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/supertypesAndBounds.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.kt
@@ -1,6 +1,3 @@
-// MODULE[js]: m1
-// FILE: k.kt
-
 trait Tr : <!DYNAMIC_SUPERTYPE!>dynamic<!>
 
 fun <T: <!DYNAMIC_UPPER_BOUND!>dynamic<!>> foo() {}
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/supertypesAndBounds.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/supertypesAndBounds.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.txt
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/varargs.kt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.kt
similarity index 83%
rename from compiler/testData/diagnostics/tests/dynamicTypes/varargs.kt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.kt
index d7ead6d9048..8199005fd1f 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/varargs.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.kt
@@ -1,8 +1,5 @@
 // !MARK_DYNAMIC_CALLS
 
-// MODULE[js]: m1
-// FILE: k.kt
-
 fun test() {
     v()
     v(1)
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/varargs.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/dynamicTypes/varargs.txt
rename to compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.txt
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index bf53278ffa0..556204102b2 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -3716,167 +3716,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dynamicTypes"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
-            @TestMetadata("assignment.kt")
-            public void testAssignment() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/assignment.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("block.kt")
-            public void testBlock() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/block.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("callableReferences.kt")
-            public void testCallableReferences() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/callableReferences.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("conditions.kt")
-            public void testConditions() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/conditions.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("conventions.kt")
-            public void testConventions() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/conventions.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("dynamicCalls.kt")
-            public void testDynamicCalls() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/dynamicCalls.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("dynamicCallsWithLambdas.kt")
-            public void testDynamicCallsWithLambdas() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/dynamicCallsWithLambdas.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("dynamicCastTarget.kt")
-            public void testDynamicCastTarget() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/dynamicCastTarget.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("dynamicSafeCalls.kt")
-            public void testDynamicSafeCalls() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/dynamicSafeCalls.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionVals.kt")
-            public void testExtensionVals() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/extensionVals.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionVars.kt")
-            public void testExtensionVars() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/extensionVars.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensions.kt")
-            public void testExtensions() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/extensions.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("extensionsToDynamic.kt")
-            public void testExtensionsToDynamic() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/extensionsToDynamic.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("implicitDynamicReceiver.kt")
-            public void testImplicitDynamicReceiver() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/implicitDynamicReceiver.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("inference.kt")
-            public void testInference() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/inference.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("membersOfAny.kt")
-            public void testMembersOfAny() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/membersOfAny.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("namedArguments.kt")
-            public void testNamedArguments() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/namedArguments.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("nullable.kt")
-            public void testNullable() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/nullable.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("overloading.kt")
-            public void testOverloading() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/overloading.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("overloadingAmbiguity.kt")
-            public void testOverloadingAmbiguity() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/overloadingAmbiguity.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("overrides.kt")
-            public void testOverrides() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/overrides.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("reified.kt")
-            public void testReified() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/reified.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("smartCast.kt")
-            public void testSmartCast() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/smartCast.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("substitution.kt")
-            public void testSubstitution() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/substitution.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("supertypesAndBounds.kt")
-            public void testSupertypesAndBounds() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/supertypesAndBounds.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("unsupported.kt")
             public void testUnsupported() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/unsupported.kt");
                 doTest(fileName);
             }
-
-            @TestMetadata("varargs.kt")
-            public void testVarargs() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/varargs.kt");
-                doTest(fileName);
-            }
         }
 
         @TestMetadata("compiler/testData/diagnostics/tests/enum")
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java
index 2d6ff65936e..602e2020410 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java
@@ -30,13 +30,184 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib")
 @TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({JetDiagnosticsTestWithJsStdLibGenerated.Native.class})
+@InnerTestClasses({JetDiagnosticsTestWithJsStdLibGenerated.DynamicTypes.class, JetDiagnosticsTestWithJsStdLibGenerated.Native.class})
 @RunWith(JUnit3RunnerWithInners.class)
 public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnosticsTestWithJsStdLib {
     public void testAllFilesPresentInTestsWithJsStdLib() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
+    @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class DynamicTypes extends AbstractJetDiagnosticsTestWithJsStdLib {
+        public void testAllFilesPresentInDynamicTypes() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("assignment.kt")
+        public void testAssignment() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/assignment.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("block.kt")
+        public void testBlock() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("callableReferences.kt")
+        public void testCallableReferences() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/callableReferences.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("conditions.kt")
+        public void testConditions() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conditions.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("conventions.kt")
+        public void testConventions() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("dynamicCalls.kt")
+        public void testDynamicCalls() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCalls.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("dynamicCallsWithLambdas.kt")
+        public void testDynamicCallsWithLambdas() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("dynamicCastTarget.kt")
+        public void testDynamicCastTarget() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("dynamicSafeCalls.kt")
+        public void testDynamicSafeCalls() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicSafeCalls.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("extensionVals.kt")
+        public void testExtensionVals() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("extensionVars.kt")
+        public void testExtensionVars() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("extensions.kt")
+        public void testExtensions() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("extensionsToDynamic.kt")
+        public void testExtensionsToDynamic() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("implicitDynamicReceiver.kt")
+        public void testImplicitDynamicReceiver() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("inference.kt")
+        public void testInference() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("membersOfAny.kt")
+        public void testMembersOfAny() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/membersOfAny.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("namedArguments.kt")
+        public void testNamedArguments() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("noUnsupportedInLocals.kt")
+        public void testNoUnsupportedInLocals() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("nullable.kt")
+        public void testNullable() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("overloading.kt")
+        public void testOverloading() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("overloadingAmbiguity.kt")
+        public void testOverloadingAmbiguity() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloadingAmbiguity.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("overrides.kt")
+        public void testOverrides() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("reified.kt")
+        public void testReified() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("smartCast.kt")
+        public void testSmartCast() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/smartCast.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("substitution.kt")
+        public void testSubstitution() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/substitution.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("supertypesAndBounds.kt")
+        public void testSupertypesAndBounds() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("varargs.kt")
+        public void testVarargs() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Native.NativeGetter.class, Native.NativeInvoke.class, Native.NativeSetter.class})