diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt
index a466f76d7cd..35815cbd77d 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt
@@ -20,7 +20,7 @@ abstract class AbstractReferenceShortenerForWholeFileTest : AbstractAnalysisApiB
 
         val shortenings = executeOnPooledThreadInReadAction {
             analyseForTest(file) {
-                ShortenStrategy.values().map { option ->
+                ShortenStrategy.entries.associateWith { option ->
                     val shorteningsForOption = collectPossibleReferenceShortenings(
                         file,
                         file.textRange,
@@ -28,7 +28,7 @@ abstract class AbstractReferenceShortenerForWholeFileTest : AbstractAnalysisApiB
                         callableShortenStrategy = { option }
                     )
 
-                    Pair(option.name, shorteningsForOption)
+                    shorteningsForOption
                 }
             }
         }
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerTest.kt
index beeb240fa44..dde180d48f2 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerTest.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerTest.kt
@@ -28,7 +28,7 @@ abstract class AbstractReferenceShortenerTest : AbstractAnalysisApiBasedSingleMo
 
         val shortenings = executeOnPooledThreadInReadAction {
             analyseForTest(element) {
-                ShortenStrategy.values().map { option ->
+                ShortenStrategy.entries.associateWith { option ->
                     val shorteningsForOption = collectPossibleReferenceShorteningsInElement(
                         element,
                         shortenOptions = ShortenOptions.ALL_ENABLED,
@@ -36,7 +36,7 @@ abstract class AbstractReferenceShortenerTest : AbstractAnalysisApiBasedSingleMo
                         callableShortenStrategy = { option }
                     )
 
-                    Pair(option.name, shorteningsForOption)
+                    shorteningsForOption
                 }
             }
         }