diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
index df5ca895189..a4bf37ec282 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
@@ -1018,8 +1018,8 @@ class SmartEnterTest : JetLightCodeInsightFixtureTestCase() {
 
     fun doFunTest(before: String, after: String) {
         fun String.withFunContext(): String {
-            val bodyText = "//----${this.trimIndent()}//----"
-            val withIndent = bodyText.split("\n").map { "    $it" }.joinToString(separator = "\n")
+            val bodyText = "//----\n${this.trimIndent()}\n//----"
+            val withIndent = bodyText.prependIndent("    ")
 
             return "fun method() {\n${withIndent}\n}"
         }
@@ -1041,32 +1041,4 @@ class SmartEnterTest : JetLightCodeInsightFixtureTestCase() {
 
     private fun String.removeFirstEmptyLines() = this.split("\n").dropWhile { it.isEmpty() }.joinToString(separator = "\n")
 
-    deprecated("use kotlin.trimIndent instead")
-    private fun String.trimIndent(): String {
-        val lines = split('\n')
-
-        val firstNonEmpty = lines.firstOrNull { !it.trim().isEmpty() }
-        if (firstNonEmpty == null) {
-            return this
-        }
-
-        val trimmedPrefix = firstNonEmpty.takeWhile { ch -> ch.isWhitespace() }
-        if (trimmedPrefix.isEmpty()) {
-            return this
-        }
-
-        return lines.map { line ->
-            if (line.trim().isEmpty()) {
-                ""
-            }
-            else {
-                if (!line.startsWith(trimmedPrefix)) {
-                    throw IllegalArgumentException(
-                            """Invalid line "$line", ${trimmedPrefix.length()} whitespace character are expected""")
-                }
-
-                line.substring(trimmedPrefix.length())
-            }
-        }.joinToString(separator = "\n")
-    }
 }
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
index a4edecb5fd9..4e455f7e6a8 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
@@ -139,33 +139,4 @@ public abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJava
     private fun createKotlinFile(text: String): JetFile {
         return myFixture.configureByText("converterTestFile.kt", text) as JetFile
     }
-
-    deprecated("use kotlin.trimIndent instead")
-    private fun String.trimIndent(): String {
-        val lines = split('\n')
-
-        val firstNonEmpty = lines.firstOrNull { !it.trim().isEmpty() }
-        if (firstNonEmpty == null) {
-            return this
-        }
-
-        val trimmedPrefix = firstNonEmpty.takeWhile { ch -> ch.isWhitespace() }
-        if (trimmedPrefix.isEmpty()) {
-            return this
-        }
-
-        return lines.map { line ->
-            if (line.trim().isEmpty()) {
-                ""
-            }
-            else {
-                if (!line.startsWith(trimmedPrefix)) {
-                    throw IllegalArgumentException(
-                            """Invalid line "$line", ${trimmedPrefix.length()} whitespace character are expected""")
-                }
-
-                line.substring(trimmedPrefix.length())
-            }
-        }.joinToString(separator = "\n")
-    }
 }