diff --git a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml b/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml
index 34615eaae4f..7ef28a95065 100644
--- a/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml
+++ b/ultimate/testData/inspections/spring/autowiring/inspectionData/expected.xml
@@ -49,15 +49,6 @@
         <description>Only one constructor can have @Autowired annotation</description>
     </problem>
 
-    <problem>
-        <file>parameterlessFunction.kt</file>
-        <line>15</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="temp:///src/parameterlessFunction.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Autowiring for Bean Class (Kotlin)</problem_class>
-        <description>Autowired method without parameters</description>
-    </problem>
-
     <problem>
         <file>invalidAutowiredResource.kt</file>
         <line>24</line>
diff --git a/ultimate/testData/spring/core/references/navigation/packageReferenceInComponentScan.kt b/ultimate/testData/spring/core/references/navigation/packageReferenceInComponentScan.kt
index e96efce0e6c..34f0550032e 100644
--- a/ultimate/testData/spring/core/references/navigation/packageReferenceInComponentScan.kt
+++ b/ultimate/testData/spring/core/references/navigation/packageReferenceInComponentScan.kt
@@ -1,5 +1,6 @@
 // NO_XML_CONFIG
 // REF: java
+// REF: java.java
 
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt
index 49d83e7a121..675675b90f6 100644
--- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/springGutterTestUtils.kt
@@ -30,7 +30,10 @@ import com.intellij.spring.model.xml.beans.SpringPropertyDefinition
 import com.intellij.testFramework.UsefulTestCase.assertSameElements
 import com.intellij.util.containers.ContainerUtil
 import com.intellij.util.xml.DomUtil
+import org.jetbrains.kotlin.asJava.elements.KtLightAnnotation
 import org.jetbrains.kotlin.idea.completion.test.assertInstanceOf
+import org.jetbrains.kotlin.psi.KtModifierListOwner
+import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
 private fun nameBean(element: PsiElement): String {
     return when (element) {
@@ -43,7 +46,10 @@ private fun nameBean(element: PsiElement): String {
 
 private fun nameProperty(element: PsiElement) = DomUtil.getDomElement(element).assertInstanceOf<SpringPropertyDefinition>().propertyName!!
 
-private fun namePsi(element: PsiElement) = SymbolPresentationUtil.getSymbolPresentableText(element)
+private fun namePsi(element: PsiElement): String {
+    if (element is KtLightAnnotation) return namePsi(element.kotlinOrigin.getStrictParentOfType<KtModifierListOwner>()!!)
+    return SymbolPresentationUtil.getSymbolPresentableText(element)
+}
 
 fun checkBeanGutterTargets(gutterMark: GutterMark, expectedBeanNames: Collection<String>) {
     checkGutterTargets(gutterMark, expectedBeanNames, ::nameBean)
diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt
index 3a4af398132..9f5ea0b3c05 100644
--- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceNavigationTest.kt
@@ -31,7 +31,7 @@ abstract class AbstractSpringReferenceNavigationTest : AbstractNavigationTest()
     override fun getSourceAndTargetElements(editor: Editor, file: PsiFile): GotoTargetHandler.GotoData? {
         val stringTemplate = file.findElementAt(editor.caretModel.offset)!!.getNonStrictParentOfType<KtStringTemplateExpression>()!!
         return GotoTargetHandler.GotoData(stringTemplate,
-                                          stringTemplate.references.mapNotNull { it.resolve() }.toTypedArray(),
+                                          stringTemplate.references.mapNotNull { it.resolve() }.distinct().toTypedArray(),
                                           emptyList())
     }