diff --git a/compiler/testData/resolveAnnotations/parameters/byte.kt b/compiler/testData/diagnostics/tests/annotations/parameters/byte.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/byte.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/byte.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/char.kt b/compiler/testData/diagnostics/tests/annotations/parameters/char.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/char.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/char.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/double.kt b/compiler/testData/diagnostics/tests/annotations/parameters/double.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/double.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/double.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/andAnd.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/andAnd.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/andAnd.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/andAnd.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/boolean.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/boolean.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/boolean.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/boolean.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/char.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/char.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/char.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/char.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/compositeCallBinary.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/compositeCallBinary.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/compositeCallBinary.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/compositeCallBinary.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/divide.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/divide.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/divide.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/divide.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/double.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/double.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/double.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/double.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/eqeq.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/eqeq.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/eqeq.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/eqeq.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/escapedString.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/escapedString.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/escapedString.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/escapedString.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/float.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/float.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/float.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/float.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/gt.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/gt.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/gt.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/gt.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/gteq.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/gteq.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/gteq.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/gteq.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/intrincics.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/intrincics.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/intrincics.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/intrincics.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/labeled.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/labeled.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/labeled.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/labeled.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/long.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/long.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/long.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/long.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/lt.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/lt.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/lt.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/lt.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/lteq.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/lteq.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/lteq.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/lteq.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/maxValue.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/maxValue.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/maxValue.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/maxValue.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/maxValueByte.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/maxValueByte.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/maxValueByte.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/maxValueByte.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/maxValueInt.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/maxValueInt.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/maxValueInt.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/maxValueInt.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/miltiply.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/miltiply.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/miltiply.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/miltiply.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/minus.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/minus.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/minus.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/minus.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/mod.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/mod.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/mod.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/mod.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/multilineString.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/multilineString.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/multilineString.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/multilineString.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/not.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/not.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/not.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/not.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/noteq.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/noteq.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/noteq.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/noteq.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/orOr.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/orOr.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/orOr.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/orOr.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/paranthesized.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/paranthesized.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/paranthesized.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/paranthesized.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/plus.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/plus.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/plus.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/plus.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/simpleCallBinary.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/simpleCallBinary.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/simpleCallBinary.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/simpleCallBinary.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/stringPlusInt.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringPlusInt.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/stringPlusInt.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringPlusInt.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/stringTemplate.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/stringTemplate.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/strings.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/strings.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/unaryMinus.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/unaryMinus.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/unaryMinus.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/unaryMinus.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/expressions/unaryPlus.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/unaryPlus.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/expressions/unaryPlus.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/expressions/unaryPlus.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/float.kt b/compiler/testData/diagnostics/tests/annotations/parameters/float.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/float.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/float.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/int.kt b/compiler/testData/diagnostics/tests/annotations/parameters/int.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/int.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/int.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/long.kt b/compiler/testData/diagnostics/tests/annotations/parameters/long.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/long.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/long.kt
diff --git a/compiler/testData/resolveAnnotations/parameters/short.kt b/compiler/testData/diagnostics/tests/annotations/parameters/short.kt
similarity index 100%
rename from compiler/testData/resolveAnnotations/parameters/short.kt
rename to compiler/testData/diagnostics/tests/annotations/parameters/short.kt