diff --git a/idea/testData/completion/keywords/InBlockComment.kt b/idea/testData/completion/keywords/InBlockComment.kt
index d2d5aac91d9..9f753c135e1 100644
--- a/idea/testData/completion/keywords/InBlockComment.kt
+++ b/idea/testData/completion/keywords/InBlockComment.kt
@@ -1,7 +1,6 @@
 class TestClass {
     /* <caret> */
     fun test() {
-        '<caret>'
     }
 }
 
diff --git a/idea/testData/hierarchy/overrides/kotlinPropertyInTrait/main0.kt b/idea/testData/hierarchy/overrides/kotlinPropertyInTrait/main0.kt
index 6a244906a60..f714f8e694a 100644
--- a/idea/testData/hierarchy/overrides/kotlinPropertyInTrait/main0.kt
+++ b/idea/testData/hierarchy/overrides/kotlinPropertyInTrait/main0.kt
@@ -3,19 +3,19 @@ trait T {
 }
 
 open class X: T {
-    override var <caret>foo: String
+    override var foo: String
         get() = ""
         set(value: String) {}
 }
 
 open trait Y: T {
-    override var <caret>foo: String
+    override var foo: String
         get() = ""
         set(value: String) {}
 }
 
 open class Z: Y {
-    override var <caret>foo: String
+    override var foo: String
         get() = ""
         set(value: String) {}
 }
diff --git a/idea/testData/resolve/referenceInLib/builtInNumber.kt b/idea/testData/resolve/referenceInLib/builtInNumber.kt
index bca8e42af70..a3e432673fe 100644
--- a/idea/testData/resolve/referenceInLib/builtInNumber.kt
+++ b/idea/testData/resolve/referenceInLib/builtInNumber.kt
@@ -1,6 +1,6 @@
 val a: <caret>Number? = null
 
-// CONTEXT: public abstract fun toDouble() : <caret>Double
+// CONTEXT: public abstract fun toDouble() : <ref-caret>Double
 // RUNTIME
 
 // REF: (jet).Double
\ No newline at end of file
diff --git a/idea/testData/resolve/referenceInLib/inLibrarySource.kt b/idea/testData/resolve/referenceInLib/inLibrarySource.kt
index 16b84db2938..48a327272ea 100644
--- a/idea/testData/resolve/referenceInLib/inLibrarySource.kt
+++ b/idea/testData/resolve/referenceInLib/inLibrarySource.kt
@@ -2,7 +2,7 @@ import inlibrary.test.*
 
 val a: <caret>ReferenceTest? = null
 
-// CONTEXT: val test: <caret>Test? = null
+// CONTEXT: val test: <ref-caret>Test? = null
 // WITH_LIBRARY: /resolve/referenceInLib/inLibrarySource
 
 // REF: (inlibrary.test).Test
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt
index 8b1cceb1ad4..f7e4ee6ac1c 100644
--- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt
+++ b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt
@@ -26,7 +26,7 @@ import junit.framework.AssertionFailedError
 
 public abstract class AbstractReferenceResolveInLibrarySourcesTest : JetLightCodeInsightFixtureTestCase() {
     class object {
-        val CARET_MARKER = "<caret>"
+        private val REF_CARET_MARKER = "<ref-caret>"
     }
 
     fun doTest(path: String) {
@@ -47,10 +47,10 @@ public abstract class AbstractReferenceResolveInLibrarySourcesTest : JetLightCod
             throw AssertionFailedError("'CONTEXT: ' directive is expected to set up position in library file: ${testedElementFile.getName()}")
         }
 
-        val inContextOffset = lineContext.indexOf(CARET_MARKER)
-        if (inContextOffset == -1) throw IllegalStateException("No '$CARET_MARKER' marker found in 'CONTEXT: $lineContext'")
+        val inContextOffset = lineContext.indexOf(REF_CARET_MARKER)
+        if (inContextOffset == -1) throw IllegalStateException("No '$REF_CARET_MARKER' marker found in 'CONTEXT: $lineContext'")
 
-        val contextStr = lineContext.replace(CARET_MARKER, "")
+        val contextStr = lineContext.replace(REF_CARET_MARKER, "")
         val offsetInFile = testedElementFile.getText()!!.indexOf(contextStr)
         if (offsetInFile == -1) throw IllegalStateException("Context '$contextStr' wasn't found in file ${testedElementFile.getName()}")