diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.fir.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.fir.kt
deleted file mode 100644
index c8eabd47541..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.fir.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-class A {
-    fun a(a: Int): Int = 0
-
-    @Deprecated("a", level = DeprecationLevel.HIDDEN)
-    fun a(a: Int) {
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.kt
deleted file mode 100644
index ed163a13f12..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInClass.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-class A {
-    <!CONFLICTING_OVERLOADS!>fun a(a: Int): Int<!> = 0
-
-    <!CONFLICTING_OVERLOADS!>@Deprecated("a", level = DeprecationLevel.HIDDEN)
-    fun a(a: Int)<!> {
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.fir.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.fir.kt
deleted file mode 100644
index a4ad3295d83..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package qwertyuiop
-
-fun c(s: String) {
-}
-
-@Deprecated("c", level = DeprecationLevel.HIDDEN)
-fun c(s: String) {
-}
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.kt
deleted file mode 100644
index f42e1dc3eb8..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsFunsDifferentReturnInPackage.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package qwertyuiop
-
-<!CONFLICTING_OVERLOADS!>fun c(s: String)<!> {
-}
-
-<!CONFLICTING_OVERLOADS!>@Deprecated("c", level = DeprecationLevel.HIDDEN)
-fun c(s: String)<!> {
-}
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.fir.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.fir.kt
deleted file mode 100644
index 8a20eab2a83..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.fir.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-fun <T1> test1(x: List<T1>) = x
-@Deprecated("test1", level = DeprecationLevel.HIDDEN)
-fun <T2> test1(x: List<T2>) = x
-
-fun <T1> List<T1>.test1a() {}
-@Deprecated("test2", level = DeprecationLevel.HIDDEN)
-fun <T2> List<T2>.test1a() {}
-
-fun <T> test2(x: List<T>) = x
-fun test2(x: List<String>) = x
-
-fun <T> List<T>.test2a() {}
-fun List<String>.test2a() {}
-
-fun <T : Any> test3(x: List<T>) = x
-fun test3(x: List<Any>) = x
-
-fun <T : Any> List<T>.test3a() {}
-fun List<Any>.test3a() {}
-
-fun <T> test4(x: Map<T, T>) = x
-fun <K, V> test4(x: Map<K, V>) = x
-
-fun <T> Map<T, T>.test4a() {}
-fun <K, V> Map<K, V>.test4a() {}
-
-class Inv<T>
-
-fun <T> test5(x: Inv<T>) = x
-@Deprecated("test5", level = DeprecationLevel.HIDDEN)
-fun <T> test5(x: Inv<out T>) = x
-
-fun <T> test6(x: Array<T>) = x
-fun test6(x: Array<String>) = x
-
-fun <T> test7(x: Inv<T>) = x
-fun <T> Inv<T>.test7() {}
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.kt
deleted file mode 100644
index 8e1b1316555..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsGenericFunctions.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-<!CONFLICTING_OVERLOADS!>fun <T1> test1(x: List<T1>)<!> = x
-<!CONFLICTING_OVERLOADS!>@Deprecated("test1", level = DeprecationLevel.HIDDEN)
-fun <T2> test1(x: List<T2>)<!> = x
-
-<!CONFLICTING_OVERLOADS!>fun <T1> List<T1>.test1a()<!> {}
-<!CONFLICTING_OVERLOADS!>@Deprecated("test2", level = DeprecationLevel.HIDDEN)
-fun <T2> List<T2>.test1a()<!> {}
-
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T> test2(x: List<T>)<!> = x
-<!CONFLICTING_JVM_DECLARATIONS!>fun test2(x: List<String>)<!> = x
-
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T> List<T>.test2a()<!> {}
-<!CONFLICTING_JVM_DECLARATIONS!>fun List<String>.test2a()<!> {}
-
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T : Any> test3(x: List<T>)<!> = x
-<!CONFLICTING_JVM_DECLARATIONS!>fun test3(x: List<Any>)<!> = x
-
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T : Any> List<T>.test3a()<!> {}
-<!CONFLICTING_JVM_DECLARATIONS!>fun List<Any>.test3a()<!> {}
-
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T> test4(x: Map<T, T>)<!> = x
-<!CONFLICTING_JVM_DECLARATIONS!>fun <K, V> test4(x: Map<K, V>)<!> = x
-
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T> Map<T, T>.test4a()<!> {}
-<!CONFLICTING_JVM_DECLARATIONS!>fun <K, V> Map<K, V>.test4a()<!> {}
-
-class Inv<T>
-
-<!CONFLICTING_OVERLOADS!>fun <T> test5(x: Inv<T>)<!> = x
-<!CONFLICTING_OVERLOADS!>@Deprecated("test5", level = DeprecationLevel.HIDDEN)
-fun <T> test5(x: Inv<out T>)<!> = x
-
-fun <T> test6(x: Array<T>) = x
-fun test6(x: Array<String>) = x
-
-fun <T> test7(x: Inv<T>) = x
-fun <T> Inv<T>.test7() {}
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.fir.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.fir.kt
deleted file mode 100644
index 08753d2691e..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.fir.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package extensionFunctions
-
-fun Int.qwe(a: Float) = 1
-
-@Deprecated("qwe", level = DeprecationLevel.HIDDEN)
-fun Int.qwe(a: Float) = 2
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.kt
deleted file mode 100644
index a9e909f1bcc..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalExtFunsInPackage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package extensionFunctions
-
-<!CONFLICTING_OVERLOADS!>fun Int.qwe(a: Float)<!> = 1
-
-<!CONFLICTING_OVERLOADS!>@Deprecated("qwe", level = DeprecationLevel.HIDDEN)
-fun Int.qwe(a: Float)<!> = 2
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.fir.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.fir.kt
deleted file mode 100644
index 68c5b239f13..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-class A() {
-    fun b() {
-    }
-
-    @Deprecated("b", level = DeprecationLevel.HIDDEN)
-    fun b() {
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.kt
deleted file mode 100644
index 4274b35b362..00000000000
--- a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalFunsInClass.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-class A() {
-    <!CONFLICTING_OVERLOADS!>fun b()<!> {
-    }
-
-    <!CONFLICTING_OVERLOADS!>@Deprecated("b", level = DeprecationLevel.HIDDEN)
-    fun b()<!> {
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalValsInClass.fir.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsIdenticalValsInClass.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalValsInClass.fir.kt
rename to compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsIdenticalValsInClass.fir.kt
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalValsInClass.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsIdenticalValsInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsIdenticalValsInClass.kt
rename to compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsIdenticalValsInClass.kt
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsValsDifferentTypeInClass.fir.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsValsDifferentTypeInClass.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsValsDifferentTypeInClass.fir.kt
rename to compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsValsDifferentTypeInClass.fir.kt
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsValsDifferentTypeInClass.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsValsDifferentTypeInClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConflictingOverloadsValsDifferentTypeInClass.kt
rename to compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConflictingOverloadsValsDifferentTypeInClass.kt
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConstructorVsFunOverload.fir.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorVsFunOverload.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConstructorVsFunOverload.fir.kt
rename to compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorVsFunOverload.fir.kt
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConstructorVsFunOverload.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorVsFunOverload.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/ConstructorVsFunOverload.kt
rename to compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/ConstructorVsFunOverload.kt
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/LocalFunctions.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/LocalFunctions.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/LocalFunctions.kt
rename to compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/LocalFunctions.kt
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/TypeParameterMultipleBounds.fir.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/TypeParameterMultipleBounds.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/TypeParameterMultipleBounds.fir.kt
rename to compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/TypeParameterMultipleBounds.fir.kt
diff --git a/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/TypeParameterMultipleBounds.kt b/compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/TypeParameterMultipleBounds.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecated/TypeParameterMultipleBounds.kt
rename to compiler/testData/diagnostics/tests/overload/noConflictingOverloadsWithDeprecatedHidden/TypeParameterMultipleBounds.kt