diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt
index bc03781848c..3d357e7c040 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/diagnostics/TextDiagnostic.kt
@@ -81,7 +81,7 @@ class TextDiagnostic(
 
         if (renderParameters && parameters != null) {
             result.append("(")
-            result.append(StringUtil.join(parameters, { "\"${it.replace('\n', ' ')}\"" }, ", "))
+            result.append(StringUtil.join(parameters, { "\"" + crossPlatformLineBreak.matcher(it).replaceAll(" ") + "\"" }, ", "))
             result.append(")")
         }
         return result.toString()
@@ -92,6 +92,8 @@ class TextDiagnostic(
     }
 
     companion object {
+        private val crossPlatformLineBreak = Pattern.compile("""\r?\n""")
+
         fun parseDiagnostic(text: String): TextDiagnostic {
             val matcher = CheckerTestUtil.individualDiagnosticPattern.matcher(text)
             if (!matcher.find())