diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSingleSymbolByPsi.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSingleSymbolByPsi.kt
index afd46451d1e..60dac193e8a 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSingleSymbolByPsi.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSingleSymbolByPsi.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.test.services.TestServices
 
 abstract class AbstractSingleSymbolByPsi : AbstractSymbolTest() {
     override fun KtAnalysisSession.collectSymbols(ktFile: KtFile, testServices: TestServices): SymbolsData {
-        val declaration = testServices.expressionMarkerProvider.getSelectedElementOfType<KtDeclaration>(ktFile)
+        val declaration = testServices.expressionMarkerProvider.getElementOfTypeAtCaret<KtDeclaration>(ktFile)
         val symbol = declaration.getSymbol()
         return SymbolsData(listOf(symbol))
     }
diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/anonympuseObjectInInvalidPosition.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/anonympuseObjectInInvalidPosition.kt
index 72ea85ddeb8..320e69b41f3 100644
--- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/anonympuseObjectInInvalidPosition.kt
+++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/anonympuseObjectInInvalidPosition.kt
@@ -1,6 +1,6 @@
-private val _commonSettingsLazy: A = null = <expr>object : A<Int> {
+private val _commonSettingsLazy: A = null = ob<caret>ject : A<Int> {
     override fun x() {}
-}</expr>
+}
 
 interface A<T> {
     fun x()
diff --git a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.kt b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.kt
index 986da96aad7..98c603e8faf 100644
--- a/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.kt
+++ b/analysis/analysis-api/testData/symbols/singleSymbolByPsi/errors/objectWithTypeArgsAsExpression.kt
@@ -1,3 +1,3 @@
-private val commonSettingsLazy = <expr>object A<LanguageVersionSettings> {
+private val commonSettingsLazy = o<caret>bject A<LanguageVersionSettings> {
    println(x)
-}</expr>
+}