diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt
index 17816840a21..0babf0078c2 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt
@@ -300,8 +300,10 @@ private fun KtSymbol?.withImplicitSymbols(): Sequence<KtSymbol> {
             yieldAll(ktSymbol.setter.withImplicitSymbols())
         }
 
-        if (ktSymbol is KtPropertySetterSymbol) {
-            yieldAll(ktSymbol.parameter.withImplicitSymbols())
+        if (ktSymbol is KtFunctionLikeSymbol) {
+            for (parameter in ktSymbol.valueParameters) {
+                yieldAll(parameter.withImplicitSymbols())
+            }
         }
 
         if (ktSymbol is KtValueParameterSymbol) {
diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.kt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.kt
index c77ab9831d2..e6d7f9f0ad2 100644
--- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.kt
+++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.kt
@@ -1 +1,3 @@
 // callable: kotlin/collections/List.get
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
+
diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt
index a6f9710ce72..9cea8c9bfb9 100644
--- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt
+++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt
@@ -1 +1,3 @@
 // callable: kotlin/collections/List.listIterator
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
+
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.kt
index 512c7ff71b7..ed3ac73a750 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.kt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.kt
@@ -1,4 +1,4 @@
-// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
 annotation class Anno(val param1: String, val param2: Int)
 
 @Anno(param1 = "param", 2)
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.kt
index f18d853c1b5..86bd1175d6c 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.kt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.kt
@@ -1,3 +1,3 @@
-// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
 class A(val a: Int, b: String) {
 }
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt
index ad5b0bfe67e..c21af428932 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.kt
@@ -1,4 +1,5 @@
 // DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
 // WITH_STDLIB
 
 class MyColor(val x: Int, val y: Int, val z: Int)
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.kt
index f3a94ed445e..04ee2a06717 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.kt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/destructuringDeclaration.kt
@@ -1,4 +1,5 @@
 // DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
 data class P(val x: Int, val y: Int)
 
 fun destruct(): Int {
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.kt
index ac0cb4b2b02..9f4d3a5f538 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.kt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.kt
@@ -1,4 +1,4 @@
-// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
 
 enum class Style(val value: String) {
     SHEET("foo") {
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.kt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.kt
index d9d92cd007e..492b0e50090 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.kt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.kt
@@ -1,4 +1,5 @@
 // DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
 fun foo() {
     val lam1 = { a: Int ->
         val b = 1
diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.kt b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.kt
index 250ea55ae06..11da7ab596b 100644
--- a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.kt
+++ b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.kt
@@ -1 +1,3 @@
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
+
 val greeter = <caret>Runnable { println("Howdy") }