diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt
deleted file mode 100644
index e387e68edb2..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_PARAMETER_IN_ANNOTATION
-package test
-
-annotation class AnnClass(val a: Class<*>)
-
-class MyClass {
-
-    AnnClass(javaClass<MyClass>()) companion object {
-    }
-
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt
deleted file mode 100644
index 49367796294..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-package
-
-package test {
-
-    internal final annotation class AnnClass : kotlin.Annotation {
-        public constructor AnnClass(/*0*/ a: java.lang.Class<*>)
-        internal final val a: java.lang.Class<*>
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    internal final class MyClass {
-        public constructor MyClass()
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        test.AnnClass(a = javaClass<test.MyClass>(): java.lang.Class<test.MyClass>) public companion object Companion {
-            private constructor Companion()
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            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/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.kt
deleted file mode 100644
index f1e76b1d440..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// FILE: A.java
-public @interface A {
-    Class<?>[] value();
-}
-
-// FILE: b.kt
-val jClass = javaClass<String>()
-A(
-    <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION, ANNOTATION_PARAMETER_MUST_BE_CLASS_LITERAL!>jClass<!>,
-    <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<Int>()<!>
-)
-class MyClass1
-
-A(
-    <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<<!UNRESOLVED_REFERENCE!>Err<!>>()<!>,
-    <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<String>()<!>
-) class MyClass2
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.txt
deleted file mode 100644
index 1a29d7db142..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-package
-
-internal val jClass: java.lang.Class<kotlin.String>
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array<out java.lang.Class<*>>*/)
-    public constructor A(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/)
-    public final val value: kotlin.Array<kotlin.reflect.KClass<*>>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun value(): kotlin.Array<kotlin.reflect.KClass<*>>
-}
-
-A(value = {javaClass<kotlin.Int>()}: kotlin.Array<out java.lang.Class<*>>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = {javaClass<[ERROR : Err]>(), javaClass<kotlin.String>()}: kotlin.Array<out java.lang.Class<*>>) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.kt
deleted file mode 100644
index c13add5e5bf..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// FILE: A.java
-public @interface A {
-    Class<?>[] value() default {Integer.class};
-    Class<?>[] arg() default {String.class};
-}
-
-// FILE: b.kt
-A(<!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<Int>()<!>,
-<!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<Any>()<!>,
-arg = <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>arrayOf(javaClass<String>(), javaClass<Double>())<!>)
-class MyClass1
-
-A(<!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<Int>()<!>, <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<Any>()<!>)
-class MyClass2
-
-A(arg = <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>arrayOf(javaClass<String>(), javaClass<Double>())<!>)
-class MyClass3
-
-A class MyClass4
-
-A(value = *<!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>arrayOf(javaClass<Int>(), javaClass<Any>())<!>,
-arg = <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>arrayOf(javaClass<String>(), javaClass<Double>())<!>)
-class MyClass5
-
-A(value = *<!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>arrayOf(javaClass<Int>(), javaClass<Any>())<!>)
-class MyClass6
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.txt
deleted file mode 100644
index 0eaeb574ec1..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array<out java.lang.Class<*>>*/ = ..., /*1*/ arg: kotlin.Array<out java.lang.Class<*>> = ...)
-    public constructor A(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/ = ..., /*1*/ arg: kotlin.Array<out kotlin.reflect.KClass<*>> = ...)
-    public final val arg: kotlin.Array<kotlin.reflect.KClass<*>>
-    public final val value: kotlin.Array<kotlin.reflect.KClass<*>>
-    public abstract fun arg(): kotlin.Array<kotlin.reflect.KClass<*>>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun value(): kotlin.Array<kotlin.reflect.KClass<*>>
-}
-
-A(arg = {javaClass<kotlin.String>(), javaClass<kotlin.Double>()}: kotlin.Array<java.lang.Class<out kotlin.Comparable<out kotlin.Any?>>>, value = {javaClass<kotlin.Int>(), javaClass<kotlin.Any>()}: kotlin.Array<out java.lang.Class<*>>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = {javaClass<kotlin.Int>(), javaClass<kotlin.Any>()}: kotlin.Array<out java.lang.Class<*>>) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = {javaClass<kotlin.String>(), javaClass<kotlin.Double>()}: kotlin.Array<java.lang.Class<out kotlin.Comparable<out kotlin.Any?>>>) internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A() internal final class MyClass4 {
-    public constructor MyClass4()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = {javaClass<kotlin.String>(), javaClass<kotlin.Double>()}: kotlin.Array<java.lang.Class<out kotlin.Comparable<out kotlin.Any?>>>, value = {javaClass<kotlin.Int>(), javaClass<kotlin.Any>()}: kotlin.Array<java.lang.Class<out kotlin.Any>>) internal final class MyClass5 {
-    public constructor MyClass5()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = {javaClass<kotlin.Int>(), javaClass<kotlin.Any>()}: kotlin.Array<java.lang.Class<out kotlin.Any>>) internal final class MyClass6 {
-    public constructor MyClass6()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.kt
deleted file mode 100644
index 4a7adf7db80..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// FILE: A.java
-public @interface A {
-    Class<?> value() default Integer.class;
-    Class<?> arg() default String.class;
-}
-
-// FILE: b.kt
-A(<!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<Int>()<!>, arg = <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<String>()<!>) class MyClass1
-A(<!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<Int>()<!>) class MyClass2
-A(arg = <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<String>()<!>) class MyClass3
-A class MyClass4
-
-A(value = <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<Int>()<!>, arg = <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<String>()<!>) class MyClass5
-A(value = <!JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION!>javaClass<Int>()<!>) class MyClass6
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.txt
deleted file mode 100644
index eed348940bd..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*> = ..., /*1*/ arg: java.lang.Class<*> = ...)
-    public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ..., /*1*/ arg: kotlin.reflect.KClass<*> = ...)
-    public final val arg: kotlin.reflect.KClass<*>
-    public final val value: kotlin.reflect.KClass<*>
-    public abstract fun arg(): kotlin.reflect.KClass<*>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun value(): kotlin.reflect.KClass<*>
-}
-
-A(arg = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, value = javaClass<kotlin.Int>(): java.lang.Class<kotlin.Int>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = javaClass<kotlin.Int>(): java.lang.Class<kotlin.Int>) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A() internal final class MyClass4 {
-    public constructor MyClass4()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, value = javaClass<kotlin.Int>(): java.lang.Class<kotlin.Int>) internal final class MyClass5 {
-    public constructor MyClass5()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = javaClass<kotlin.Int>(): java.lang.Class<kotlin.Int>) internal final class MyClass6 {
-    public constructor MyClass6()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.kt
deleted file mode 100644
index b51dd5d8d07..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// FILE: A.java
-public @interface A {
-    Class<?> x() default Integer.class;
-    int y();
-}
-
-// FILE: b.kt
-@A(x = <!TYPE_MISMATCH(kotlin.reflect.KClass<*>; java.lang.Class<kotlin.Any>)!>javaClass<Any>()<!>, y = <!TYPE_MISMATCH!>""<!>) fun test1() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.txt
deleted file mode 100644
index 84056350e8b..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-package
-
-A(x = javaClass<kotlin.Any>(): java.lang.Class<kotlin.Any>, y = "": kotlin.String) internal fun test1(): kotlin.Unit
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ x: java.lang.Class<*> = ..., /*1*/ y: kotlin.Int)
-    public constructor A(/*0*/ x: kotlin.reflect.KClass<*> = ..., /*1*/ y: kotlin.Int)
-    public final val x: kotlin.reflect.KClass<*>
-    public final val y: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun x(): kotlin.reflect.KClass<*>
-    public abstract fun y(): kotlin.Int
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.kt
deleted file mode 100644
index b6230f93c16..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?> arg() default Integer.class;
-    int x() default 1;
-    B b();
-}
-
-// FILE: B.java
-public @interface B {
-    Class<?> arg() default String.class;
-    int y() default 2;
-}
-
-// FILE: c.kt
-A(arg = javaClass<String>(), b = B()) class MyClass1
-
-A(b = B(y = 3)) class MyClass3
-
-A(b = B(arg = javaClass<Double>())) class MyClass4
-
-A(arg = javaClass<Boolean>(), b = B(arg = Char::class)) class MyClass5
-
-A(arg = String::class, b = B(arg = javaClass<Boolean>())) class MyClass6
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.txt
deleted file mode 100644
index 0ff9680a4c9..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*> = ..., /*1*/ x: kotlin.Int = ..., /*2*/ b: B)
-    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int = ..., /*2*/ b: B)
-    public final val arg: kotlin.reflect.KClass<*>
-    public final val b: B
-    public final val x: kotlin.Int
-    public abstract fun arg(): kotlin.reflect.KClass<*>
-    public abstract fun b(): B
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun x(): kotlin.Int
-}
-
-public final annotation class B : kotlin.Annotation {
-    public /*synthesized*/ constructor B(/*0*/ arg: java.lang.Class<*> = ..., /*1*/ y: kotlin.Int = ...)
-    public constructor B(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ y: kotlin.Int = ...)
-    public final val arg: kotlin.reflect.KClass<*>
-    public final val y: kotlin.Int
-    public abstract fun arg(): kotlin.reflect.KClass<*>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun y(): kotlin.Int
-}
-
-A(arg = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, b = B(): B) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(b = B(y = IntegerValueType(3): IntegerValueType(3)): B) internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(b = B(arg = javaClass<kotlin.Double>(): java.lang.Class<kotlin.Double>): B) internal final class MyClass4 {
-    public constructor MyClass4()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = javaClass<kotlin.Boolean>(): java.lang.Class<kotlin.Boolean>, b = B(arg = kotlin.Char::class: kotlin.reflect.KClass<kotlin.Char>): B) internal final class MyClass5 {
-    public constructor MyClass5()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, b = B(arg = javaClass<kotlin.Boolean>(): java.lang.Class<kotlin.Boolean>): B) internal final class MyClass6 {
-    public constructor MyClass6()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.kt
deleted file mode 100644
index 7a1396bcc91..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?> arg();
-}
-
-// FILE: b.kt
-A(arg = javaClass<String>()) class MyClass
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.txt
deleted file mode 100644
index 3a81bf72786..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*>)
-    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>)
-    public final val arg: kotlin.reflect.KClass<*>
-    public abstract fun arg(): kotlin.reflect.KClass<*>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass {
-    public constructor MyClass()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.kt
deleted file mode 100644
index ef3b33d8760..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?> arg();
-    int x() default 1;
-}
-
-// FILE: b.kt
-A(arg = javaClass<String>()) class MyClass1
-
-A(arg = javaClass<String>(), x = 1) class MyClass2
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.txt
deleted file mode 100644
index 9bab3ef7fb5..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*>, /*1*/ x: kotlin.Int = ...)
-    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...)
-    public final val arg: kotlin.reflect.KClass<*>
-    public final val x: kotlin.Int
-    public abstract fun arg(): kotlin.reflect.KClass<*>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun x(): kotlin.Int
-}
-
-A(arg = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, x = IntegerValueType(1): IntegerValueType(1)) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.kt
deleted file mode 100644
index ebb85dc60c4..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?>[] arg();
-}
-
-// FILE: b.kt
-
-A(arg = arrayOf(javaClass<String>(), javaClass<Int>())) class MyClass1
-
-A(arg = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf<!>(javaClass<String>(), Int::class)) class MyClass2
-A(arg = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf<!>(String::class, javaClass<Int>())) class MyClass3
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.txt
deleted file mode 100644
index c4604112a42..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ arg: kotlin.Array<out java.lang.Class<*>>)
-    public constructor A(/*0*/ arg: kotlin.Array<out kotlin.reflect.KClass<*>>)
-    public final val arg: kotlin.Array<kotlin.reflect.KClass<*>>
-    public abstract fun arg(): kotlin.Array<kotlin.reflect.KClass<*>>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = {javaClass<kotlin.String>(), javaClass<kotlin.Int>()}: kotlin.Array<java.lang.Class<out kotlin.Comparable<out kotlin.Any?>>>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = {javaClass<kotlin.String>(), kotlin.Int::class}: kotlin.Array<???>) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = {kotlin.String::class, javaClass<kotlin.Int>()}: kotlin.Array<???>) internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.kt
deleted file mode 100644
index d04d441d20b..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?> arg() default Integer.class;
-}
-
-// FILE: b.kt
-A(arg = javaClass<String>()) class MyClass1
-A class MyClass3
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.txt
deleted file mode 100644
index dcc9c1021d3..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*> = ...)
-    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ...)
-    public final val arg: kotlin.reflect.KClass<*>
-    public abstract fun arg(): kotlin.reflect.KClass<*>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A() internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.kt
deleted file mode 100644
index 8805cfd89dc..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?> arg() default Integer.class;
-    int x();
-}
-
-// FILE: b.kt
-A(arg = javaClass<String>(), x = 3) class MyClass1
-A(x = 5) class MyClass2
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.txt
deleted file mode 100644
index 803f399b5bc..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ arg: java.lang.Class<*> = ..., /*1*/ x: kotlin.Int)
-    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int)
-    public final val arg: kotlin.reflect.KClass<*>
-    public final val x: kotlin.Int
-    public abstract fun arg(): kotlin.reflect.KClass<*>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun x(): kotlin.Int
-}
-
-A(arg = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, x = IntegerValueType(3): IntegerValueType(3)) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(x = IntegerValueType(5): IntegerValueType(5)) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.kt
deleted file mode 100644
index a7073261ab5..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?> arg1();
-    Class<?> arg2();
-}
-
-// FILE: b.kt
-A(arg1 = javaClass<String>(), arg2 = javaClass<Int>()) class MyClass1
-
-A(arg1 = <!TYPE_MISMATCH!>javaClass<String>()<!>, arg2 = Int::class) class MyClass3
-A(arg1 = String::class, arg2 = <!TYPE_MISMATCH!>javaClass<Int>()<!>) class MyClass4
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.txt
deleted file mode 100644
index 81095b3c74e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ arg1: java.lang.Class<*>, /*1*/ arg2: java.lang.Class<*>)
-    public constructor A(/*0*/ arg1: kotlin.reflect.KClass<*>, /*1*/ arg2: kotlin.reflect.KClass<*>)
-    public final val arg1: kotlin.reflect.KClass<*>
-    public final val arg2: kotlin.reflect.KClass<*>
-    public abstract fun arg1(): kotlin.reflect.KClass<*>
-    public abstract fun arg2(): kotlin.reflect.KClass<*>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg1 = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, arg2 = javaClass<kotlin.Int>(): java.lang.Class<kotlin.Int>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg1 = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, arg2 = kotlin.Int::class: kotlin.reflect.KClass<kotlin.Int>) internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(arg1 = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, arg2 = javaClass<kotlin.Int>(): java.lang.Class<kotlin.Int>) internal final class MyClass4 {
-    public constructor MyClass4()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.kt
deleted file mode 100644
index 748f15e1b05..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?> value();
-}
-
-// FILE: b.kt
-A(javaClass<String>()) class MyClass1
-A(value = javaClass<String>()) class MyClass2
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.txt
deleted file mode 100644
index d26196e2b25..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*>)
-    public constructor A(/*0*/ value: kotlin.reflect.KClass<*>)
-    public final val value: kotlin.reflect.KClass<*>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun value(): kotlin.reflect.KClass<*>
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.kt
deleted file mode 100644
index f9dc38bf1c9..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?> value();
-    int x() default 1;
-}
-
-// FILE: b.kt
-A(javaClass<String>()) class MyClass1
-A(value = javaClass<String>()) class MyClass2
-
-A(javaClass<String>(), x = 1) class MyClass3
-A(value = javaClass<String>(), x = 3) class MyClass4
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.txt
deleted file mode 100644
index 3018b0c2026..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*>, /*1*/ x: kotlin.Int = ...)
-    public constructor A(/*0*/ value: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...)
-    public final val value: kotlin.reflect.KClass<*>
-    public final val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun value(): kotlin.reflect.KClass<*>
-    public abstract fun x(): kotlin.Int
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, x = IntegerValueType(1): IntegerValueType(1)) internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, x = IntegerValueType(3): IntegerValueType(3)) internal final class MyClass4 {
-    public constructor MyClass4()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.kt
deleted file mode 100644
index a3fda678725..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?>[] value();
-}
-
-// FILE: b.kt
-A(javaClass<String>(), javaClass<Int>()) class MyClass1
-
-A(*arrayOf(javaClass<String>(), javaClass<Int>())) class MyClass2
-
-A(value = *arrayOf(javaClass<String>(), javaClass<Int>())) class MyClass3
-
-A(<!TYPE_MISMATCH!>javaClass<String>()<!>, Int::class) class MyClass4
-A(String::class, <!TYPE_MISMATCH!>javaClass<Int>()<!>) class MyClass5
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.txt
deleted file mode 100644
index ef2e0856539..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array<out java.lang.Class<*>>*/)
-    public constructor A(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/)
-    public final val value: kotlin.Array<kotlin.reflect.KClass<*>>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun value(): kotlin.Array<kotlin.reflect.KClass<*>>
-}
-
-A(value = {javaClass<kotlin.String>(), javaClass<kotlin.Int>()}: kotlin.Array<out java.lang.Class<*>>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = {javaClass<kotlin.String>(), javaClass<kotlin.Int>()}: kotlin.Array<java.lang.Class<out kotlin.Comparable<out kotlin.Any?>>>) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = {javaClass<kotlin.String>(), javaClass<kotlin.Int>()}: kotlin.Array<java.lang.Class<out kotlin.Comparable<out kotlin.Any?>>>) internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = {javaClass<kotlin.String>(), kotlin.Int::class}: kotlin.Array<out kotlin.reflect.KClass<*>>) internal final class MyClass4 {
-    public constructor MyClass4()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = {kotlin.String::class, javaClass<kotlin.Int>()}: kotlin.Array<out kotlin.reflect.KClass<*>>) internal final class MyClass5 {
-    public constructor MyClass5()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.kt
deleted file mode 100644
index ddb45581519..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-    Class<?> value() default Integer.class;
-}
-
-// FILE: b.kt
-A(javaClass<String>()) class MyClass1
-
-A(value = javaClass<String>()) class MyClass2
-
-A class MyClass3
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.txt
deleted file mode 100644
index 8cc9ce0ce87..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*> = ...)
-    public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ...)
-    public final val value: kotlin.reflect.KClass<*>
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun value(): kotlin.reflect.KClass<*>
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A() internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.kt
deleted file mode 100644
index 79fc3d79c55..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// !DIAGNOSTICS: -JAVA_LANG_CLASS_ARGUMENT_IN_ANNOTATION
-// FILE: A.java
-public @interface A {
-Class<?> value() default Integer.class;
-int x();
-}
-
-// FILE: b.kt
-A(javaClass<String>(), x = 1) class MyClass1
-A(value = javaClass<String>(), x = 3) class MyClass2
-A(x = 5) class MyClass3
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.txt
deleted file mode 100644
index 2d2ceb403a6..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-package
-
-public final annotation class A : kotlin.Annotation {
-    public /*synthesized*/ constructor A(/*0*/ value: java.lang.Class<*> = ..., /*1*/ x: kotlin.Int)
-    public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int)
-    public final val value: kotlin.reflect.KClass<*>
-    public final val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public abstract fun value(): kotlin.reflect.KClass<*>
-    public abstract fun x(): kotlin.Int
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, x = IntegerValueType(1): IntegerValueType(1)) internal final class MyClass1 {
-    public constructor MyClass1()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(value = javaClass<kotlin.String>(): java.lang.Class<kotlin.String>, x = IntegerValueType(3): IntegerValueType(3)) internal final class MyClass2 {
-    public constructor MyClass2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-A(x = IntegerValueType(5): IntegerValueType(5)) internal final class MyClass3 {
-    public constructor MyClass3()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    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/writeSignature/annotations/jArrayClassOfKClass.kt b/compiler/testData/writeSignature/annotations/jArrayClassOfKClass.kt
deleted file mode 100644
index df991b6c4e5..00000000000
--- a/compiler/testData/writeSignature/annotations/jArrayClassOfKClass.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import kotlin.reflect.KClass
-
-annotation class Ann(val arg: Array<out Class<out KClass<*>>>)
-
-// method: Ann::arg
-// jvm signature:     ()[Ljava/lang/Class;
-// generic signature: ()[Ljava/lang/Class<+Lkotlin/reflect/KClass<*>;>;
diff --git a/compiler/testData/writeSignature/annotations/jClassBasic.kt b/compiler/testData/writeSignature/annotations/jClassBasic.kt
deleted file mode 100644
index 9307dc6b484..00000000000
--- a/compiler/testData/writeSignature/annotations/jClassBasic.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import kotlin.reflect.KClass
-
-annotation class Ann(val arg: Class<*>)
-
-// method: Ann::arg
-// jvm signature:     ()Ljava/lang/Class;
-// generic signature: ()Ljava/lang/Class<*>;
diff --git a/compiler/testData/writeSignature/annotations/jClassInt.kt b/compiler/testData/writeSignature/annotations/jClassInt.kt
deleted file mode 100644
index edc18adc5a3..00000000000
--- a/compiler/testData/writeSignature/annotations/jClassInt.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import kotlin.reflect.KClass
-
-annotation class Ann(val arg: Class<Int>)
-
-// method: Ann::arg
-// jvm signature:     ()Ljava/lang/Class;
-// generic signature: ()Ljava/lang/Class<Ljava/lang/Integer;>;
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java
index 0fdad7048fa..505ffc00104 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java
@@ -61,12 +61,6 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             doTest(fileName);
         }
 
-        @TestMetadata("ClassObjectAnnotatedWithItsClass.kt")
-        public void testClassObjectAnnotatedWithItsClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("ClassObjectAnnotatedWithItsKClass.kt")
         public void testClassObjectAnnotatedWithItsKClass() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.kt");
@@ -147,24 +141,6 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
-            @TestMetadata("javaClassArgumentError.kt")
-            public void testJavaClassArgumentError() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArgumentError.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("javaClassArrayInAnnotations.kt")
-            public void testJavaClassArrayInAnnotations() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassArrayInAnnotations.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("javaClassInAnnotations.kt")
-            public void testJavaClassInAnnotations() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/javaClassInAnnotations.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("orderWithValue.kt")
             public void testOrderWithValue() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.kt");
@@ -189,12 +165,6 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
                 doTest(fileName);
             }
 
-            @TestMetadata("valueArrayAndOtherDefaultError.kt")
-            public void testValueArrayAndOtherDefaultError() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefaultError.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("valueArrayOnly.kt")
             public void testValueArrayOnly() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.kt");
@@ -229,87 +199,6 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             }
         }
 
-        @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class AnnotationsWithJavaLangClassParameterOverload extends AbstractJetDiagnosticsTestWithStdLib {
-            public void testAllFilesPresentInAnnotationsWithJavaLangClassParameterOverload() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload"), Pattern.compile("^(.+)\\.kt$"), true);
-            }
-
-            @TestMetadata("annotationAsArgument.kt")
-            public void testAnnotationAsArgument() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/annotationAsArgument.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("arg.kt")
-            public void testArg() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/arg.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("argAndOtherDefault.kt")
-            public void testArgAndOtherDefault() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argAndOtherDefault.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("argArray.kt")
-            public void testArgArray() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argArray.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("argWithDefault.kt")
-            public void testArgWithDefault() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefault.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("argWithDefaultAndOther.kt")
-            public void testArgWithDefaultAndOther() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/argWithDefaultAndOther.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("twoArgs.kt")
-            public void testTwoArgs() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/twoArgs.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("value.kt")
-            public void testValue() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/value.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("valueAndOtherDefault.kt")
-            public void testValueAndOtherDefault() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueAndOtherDefault.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("valueArray.kt")
-            public void testValueArray() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueArray.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("valueWithDefault.kt")
-            public void testValueWithDefault() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefault.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("valueWithDefaultAndOther.kt")
-            public void testValueWithDefaultAndOther() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsWithJavaLangClassParameterOverload/valueWithDefaultAndOther.kt");
-                doTest(fileName);
-            }
-        }
-
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java
index 46f51382822..0aebb8380f8 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java
@@ -145,24 +145,6 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
-        @TestMetadata("jArrayClassOfKClass.kt")
-        public void testJArrayClassOfKClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/jArrayClassOfKClass.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("jClassBasic.kt")
-        public void testJClassBasic() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/jClassBasic.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("jClassInt.kt")
-        public void testJClassInt() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/jClassInt.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("kArrayClassOfJClass.kt")
         public void testKArrayClassOfJClass() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/kArrayClassOfJClass.kt");