diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/annotator/AbstractAndroidGutterIconTest.kt b/idea/idea-android/tests/org/jetbrains/kotlin/android/annotator/AbstractAndroidGutterIconTest.kt
index bfeba001444..71604ed4ff5 100644
--- a/idea/idea-android/tests/org/jetbrains/kotlin/android/annotator/AbstractAndroidGutterIconTest.kt
+++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/annotator/AbstractAndroidGutterIconTest.kt
@@ -52,11 +52,11 @@ abstract class AbstractAndroidGutterIconTest : KotlinAndroidTestCase() {
             val sourceFile = myFixture.copyFileToProject(path, "src/${PathUtil.getFileName(path)}")
             myFixture.configureFromExistingVirtualFile(sourceFile)
 
-            val gutter = myFixture.findAllGutters().find {
+            val gutter = myFixture.findGuttersAtCaret().find {
                 when {
                     drawable -> it.icon is ImageIcon
                     color != null -> (it.icon as? ColorIcon)?.iconColor == color
-                    else -> error("COLOR or DRAWABLE must be defined!")
+                    else -> true
                 }
             }
 
diff --git a/idea/testData/android/gutterIcon/color.kt b/idea/testData/android/gutterIcon/color.kt
index c57cf7bece4..5e685dd5aa4 100644
--- a/idea/testData/android/gutterIcon/color.kt
+++ b/idea/testData/android/gutterIcon/color.kt
@@ -3,4 +3,4 @@ package com.myapp
 
 import android.content.Context
 
-<caret>fun Context.getPrimaryColor() = resources.getColor(R.color.colorAccent, null)
\ No newline at end of file
+fun Context.getPrimaryColor() = resources.getColor(R.color.<caret>colorAccent, null)
\ No newline at end of file
diff --git a/idea/testData/android/gutterIcon/drawable.kt b/idea/testData/android/gutterIcon/drawable.kt
index d69383f813e..a9c2328d371 100644
--- a/idea/testData/android/gutterIcon/drawable.kt
+++ b/idea/testData/android/gutterIcon/drawable.kt
@@ -3,4 +3,4 @@ package com.myapp
 
 import android.content.Context
 
-<caret>fun Context.getAddIcon() = resources.getDrawable(R.drawable.test_icon, null)
\ No newline at end of file
+fun Context.getAddIcon() = resources.getDrawable(R.drawable.<caret>test_icon, null)
\ No newline at end of file
diff --git a/idea/testData/android/gutterIcon/mipmap.kt b/idea/testData/android/gutterIcon/mipmap.kt
index ad893e0dd31..8571a698727 100644
--- a/idea/testData/android/gutterIcon/mipmap.kt
+++ b/idea/testData/android/gutterIcon/mipmap.kt
@@ -3,4 +3,4 @@ package com.myapp
 
 import android.content.Context
 
-<caret>fun Context.getAddIcon() = resources.getDrawable(R.mipmap.test_icon, null)
\ No newline at end of file
+fun Context.getAddIcon() = resources.getDrawable(R.mipmap.<caret>test_icon, null)
\ No newline at end of file
diff --git a/idea/testData/android/gutterIcon/res/layout/layout.xml b/idea/testData/android/gutterIcon/res/layout/activity_kotlin.xml
similarity index 100%
rename from idea/testData/android/gutterIcon/res/layout/layout.xml
rename to idea/testData/android/gutterIcon/res/layout/activity_kotlin.xml
diff --git a/idea/testData/android/gutterIcon/systemColor.kt b/idea/testData/android/gutterIcon/systemColor.kt
index 56c8bda8953..883f1e87273 100644
--- a/idea/testData/android/gutterIcon/systemColor.kt
+++ b/idea/testData/android/gutterIcon/systemColor.kt
@@ -1,4 +1,4 @@
 // COLOR: 0,0,0
 import android.content.Context
 
-<caret>fun getBlackColor() = android.R.color.black
\ No newline at end of file
+fun getBlackColor() = android.R.color.<caret>black
\ No newline at end of file
diff --git a/idea/testData/android/gutterIcon/systemDrawable.kt b/idea/testData/android/gutterIcon/systemDrawable.kt
index 116ccd63cf0..6b52a3468e4 100644
--- a/idea/testData/android/gutterIcon/systemDrawable.kt
+++ b/idea/testData/android/gutterIcon/systemDrawable.kt
@@ -1,4 +1,4 @@
 // DRAWABLE
 import android.content.Context
 
-fun <caret>Context.getAddIcon() = resources.getDrawable(android.R.drawable.ic_menu_add, null)
\ No newline at end of file
+fun Context.getAddIcon() = resources.getDrawable(android.R.drawable.<caret>ic_menu_add, null)
\ No newline at end of file