diff --git a/libraries/tools/kotlin-annotation-processing/src/test/kotlin/org/jetbrains/kotlin/annotation/AnnotationListParseTest.kt b/libraries/tools/kotlin-annotation-processing/src/test/kotlin/org/jetbrains/kotlin/annotation/AnnotationListParseTest.kt
index 0e32b348ac1..7337969ae1f 100644
--- a/libraries/tools/kotlin-annotation-processing/src/test/kotlin/org/jetbrains/kotlin/annotation/AnnotationListParseTest.kt
+++ b/libraries/tools/kotlin-annotation-processing/src/test/kotlin/org/jetbrains/kotlin/annotation/AnnotationListParseTest.kt
@@ -51,6 +51,9 @@ public class AnnotationListParseTest {
                 when (element) {
                     is AnnotatedMethodDescriptor -> actualAnnotations.append(' ').append(element.methodName)
                     is AnnotatedFieldDescriptor -> actualAnnotations.append(' ').append(element.fieldName)
+                    is AnnotatedConstructorDescriptor -> actualAnnotations.append(" <init>")
+                    is AnnotatedClassDescriptor -> {}
+                    else -> Assert.fail("Unknown element type: $element")
                 }
                 actualAnnotations.append('\n')
             }
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotatedGettersSetters/annotations.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotatedGettersSetters/annotations.txt
new file mode 100644
index 00000000000..726d49dd5f9
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotatedGettersSetters/annotations.txt
@@ -0,0 +1,11 @@
+a kotlin.data 0
+p org.test 0
+c 0 0/SomeClass
+a java.lang.Deprecated 1
+m 1 0/SomeClass getImmutableProperty
+a org.jetbrains.annotations.NotNull 2
+f 2 0/SomeClass mutableProperty
+m 1 0/SomeClass getMutableProperty
+m 2 0/SomeClass getMutableProperty
+m 1 0/SomeClass setMutableProperty
+m 2 0/SomeClass copy
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotatedGettersSetters/parsed.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotatedGettersSetters/parsed.txt
new file mode 100644
index 00000000000..00bbe9c57cc
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotatedGettersSetters/parsed.txt
@@ -0,0 +1,7 @@
+java.lang.Deprecated org.test.SomeClass getImmutableProperty
+java.lang.Deprecated org.test.SomeClass getMutableProperty
+java.lang.Deprecated org.test.SomeClass setMutableProperty
+kotlin.data org.test.SomeClass
+org.jetbrains.annotations.NotNull org.test.SomeClass copy
+org.jetbrains.annotations.NotNull org.test.SomeClass getMutableProperty
+org.jetbrains.annotations.NotNull org.test.SomeClass mutableProperty
\ No newline at end of file
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotationInSameFile/annotations.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotationInSameFile/annotations.txt
new file mode 100644
index 00000000000..89c154ea586
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotationInSameFile/annotations.txt
@@ -0,0 +1,4 @@
+a org.test.SomeAnnotation 0
+p org.test 0
+c 0 0/SomeClass
+m 0 0/SomeClass annotatedFunction
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotationInSameFile/parsed.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotationInSameFile/parsed.txt
new file mode 100644
index 00000000000..d66264e7c2b
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/annotationInSameFile/parsed.txt
@@ -0,0 +1,2 @@
+org.test.SomeAnnotation org.test.SomeClass
+org.test.SomeAnnotation org.test.SomeClass annotatedFunction
\ No newline at end of file
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/anonymousClasses/annotations.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/anonymousClasses/annotations.txt
new file mode 100644
index 00000000000..c5234bbf612
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/anonymousClasses/annotations.txt
@@ -0,0 +1,3 @@
+a java.lang.Deprecated 0
+p org.test 0
+f 0 0/SomeClass$a$1 property
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/anonymousClasses/parsed.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/anonymousClasses/parsed.txt
new file mode 100644
index 00000000000..3fc0d0f018e
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/anonymousClasses/parsed.txt
@@ -0,0 +1 @@
+java.lang.Deprecated org.test.SomeClass.a.1 property
\ No newline at end of file
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/constructors/annotations.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/constructors/annotations.txt
new file mode 100644
index 00000000000..9bda17de858
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/constructors/annotations.txt
@@ -0,0 +1,4 @@
+a java.lang.Deprecated 0
+p org.test 0
+m 0 0/SomeClass <init>
+m 0 0/SomeClass <init>
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/constructors/parsed.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/constructors/parsed.txt
new file mode 100644
index 00000000000..e252bab0e31
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/constructors/parsed.txt
@@ -0,0 +1,2 @@
+java.lang.Deprecated org.test.SomeClass <init>
+java.lang.Deprecated org.test.SomeClass <init>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/localClasses/parsed.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/localClasses/parsed.txt
index 67521be73fc..5b2448e4d47 100644
--- a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/localClasses/parsed.txt
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/localClasses/parsed.txt
@@ -1,5 +1,5 @@
-javax.inject.Inject org.test.SomeClass$someFunction$LocalClass annotatedFunction
-javax.inject.Inject org.test.SomeClass$someFunction$LocalClass annotatedProperty
-javax.inject.Named org.test.SomeClass$someFunction$LocalClass
-org.jetbrains.annotations.Nullable org.test.SomeClass$someFunction$LocalClass annotatedProperty
-org.jetbrains.annotations.Nullable org.test.SomeClass$someFunction$LocalClass getAnnotatedProperty
\ No newline at end of file
+javax.inject.Inject org.test.SomeClass.someFunction.LocalClass annotatedFunction
+javax.inject.Inject org.test.SomeClass.someFunction.LocalClass annotatedProperty
+javax.inject.Named org.test.SomeClass.someFunction.LocalClass
+org.jetbrains.annotations.Nullable org.test.SomeClass.someFunction.LocalClass annotatedProperty
+org.jetbrains.annotations.Nullable org.test.SomeClass.someFunction.LocalClass getAnnotatedProperty
\ No newline at end of file
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/methodAnnotations/parsed.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/methodAnnotations/parsed.txt
index 62c799ca229..bcb6a3ab5ec 100644
--- a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/methodAnnotations/parsed.txt
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/methodAnnotations/parsed.txt
@@ -1,2 +1,2 @@
 javax.inject.Inject org.test.SomeClass annotatedFunction
-javax.inject.Named org.test.SomeClass$annotatedFunction$1 invoke
\ No newline at end of file
+javax.inject.Named org.test.SomeClass.annotatedFunction.1 invoke
\ No newline at end of file
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/nestedClasses/parsed.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/nestedClasses/parsed.txt
index eaab9ec8d68..5611a2ca5d2 100644
--- a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/nestedClasses/parsed.txt
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/nestedClasses/parsed.txt
@@ -1,6 +1,6 @@
 java.lang.Deprecated org.test.SomeClass OBJECT$
-javax.inject.Named org.test.SomeClass$Companion
-javax.inject.Named org.test.SomeClass$InnerClass
-javax.inject.Named org.test.SomeClass$NestedClass
-javax.inject.Named org.test.SomeClass$SomeInnerObject
-org.jetbrains.annotations.NotNull org.test.SomeClass$Companion access$init$0
\ No newline at end of file
+javax.inject.Named org.test.SomeClass.Companion
+javax.inject.Named org.test.SomeClass.InnerClass
+javax.inject.Named org.test.SomeClass.NestedClass
+javax.inject.Named org.test.SomeClass.SomeInnerObject
+org.jetbrains.annotations.NotNull org.test.SomeClass.Companion access$init$0
\ No newline at end of file
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/platformStatic/annotations.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/platformStatic/annotations.txt
new file mode 100644
index 00000000000..4d9c66f1134
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/platformStatic/annotations.txt
@@ -0,0 +1,11 @@
+a kotlin.platform.platformStatic 0
+p org.test 0
+m 0 0/SomeClass$Companion a
+a kotlin.inline 1
+m 1 0/SomeClass$Companion a
+a org.jetbrains.annotations.NotNull 2
+m 2 0/SomeClass$Companion access$init$0
+a java.lang.Deprecated 3
+f 3 0/SomeClass OBJECT$
+m 0 0/SomeClass a
+m 1 0/SomeClass a
diff --git a/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/platformStatic/parsed.txt b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/platformStatic/parsed.txt
new file mode 100644
index 00000000000..0cb4a1b4bed
--- /dev/null
+++ b/libraries/tools/kotlin-annotation-processing/src/test/resources/parse/platformStatic/parsed.txt
@@ -0,0 +1,4 @@
+java.lang.Deprecated org.test.SomeClass OBJECT$
+kotlin.inline org.test.SomeClass.Companion a
+kotlin.platform.platformStatic org.test.SomeClass.Companion a
+org.jetbrains.annotations.NotNull org.test.SomeClass.Companion access$init$0
\ No newline at end of file