diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
index ca5a53a417a..39d7650db7a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluat
 
 public class ConvertToStringTemplateInspection : IntentionBasedInspection<JetBinaryExpression>(
         ConvertToStringTemplateIntention(),
-        { ConvertToStringTemplateIntention().isConversionResultSimple(it) }
+        { ConvertToStringTemplateIntention().shouldSuggestToConvert(it) }
 )
 
 public class ConvertToStringTemplateIntention : JetSelfTargetingOffsetIndependentIntention<JetBinaryExpression>(javaClass(), "Convert concatenation to template") {
@@ -50,8 +50,9 @@ public class ConvertToStringTemplateIntention : JetSelfTargetingOffsetIndependen
         return element.replaced(buildReplacement(element))
     }
 
-    public fun isConversionResultSimple(expression: JetBinaryExpression): Boolean {
-        return buildReplacement(expression).getEntries().none { it is JetBlockStringTemplateEntry }
+    public fun shouldSuggestToConvert(expression: JetBinaryExpression): Boolean {
+        val entries = buildReplacement(expression).entries
+        return entries.none { it is JetBlockStringTemplateEntry } && entries.count { it is JetLiteralStringTemplateEntry } > 1
     }
 
     private fun isApplicableToNoParentCheck(expression: JetBinaryExpression): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
index 707b73dc8ed..9fbe64965eb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
@@ -148,7 +148,7 @@ object J2KPostProcessingRegistrar {
         private val intention = ConvertToStringTemplateIntention()
 
         override fun createAction(element: JetElement, diagnostics: Diagnostics): (() -> Unit)? {
-            if (element is JetBinaryExpression && intention.isApplicableTo(element) && intention.isConversionResultSimple(element)) {
+            if (element is JetBinaryExpression && intention.isApplicableTo(element) && intention.shouldSuggestToConvert(element)) {
                 return { intention.applyTo(element) }
             }
             else {
diff --git a/idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml b/idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml
index c790804144c..7d7fe184033 100644
--- a/idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml
+++ b/idea/testData/intentions/convertToStringTemplate/inspectionData/expected.xml
@@ -1,20 +1,4 @@
 <problems>
-    <problem>
-        <file>noBracesSimpleFollowedByDot.kt</file>
-        <line>3</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="noBracesSimpleFollowedByDot.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
-    <problem>
-        <file>noBracesForLastSimpleExpression.kt</file>
-        <line>3</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="noBracesForLastSimpleExpression.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
     <problem>
         <file>multilineString.kt</file>
         <line>3</line>
@@ -23,78 +7,7 @@
         <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
         <description>Convert concatenation to template</description>
     </problem>
-    <problem>
-        <file>interpolateStringWithInt.kt</file>
-        <line>2</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="interpolateStringWithInt.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
-    <problem>
-        <file>interpolateStringWithFloat.kt</file>
-        <line>2</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="interpolateStringWithFloat.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
-    <problem>
-        <file>interpolateDollarSign.kt</file>
-        <line>2</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="interpolateDollarSign.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
-    <problem>
-        <file>interpolateChar.kt</file>
-        <line>2</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="interpolateChar.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
-    <problem>
-        <file>interpolate2Vals.kt</file>
-        <line>4</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="interpolate2Vals.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
-    <problem>
-        <file>interpolate2StringConstants.kt</file>
-        <line>2</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="interpolate2StringConstants.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
-    <problem>
-        <file>combinesNonStringsAsStrings2.kt</file>
-        <line>2</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="combinesNonStringsAsStrings2.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
-    <problem>
-        <file>combinesNonStringsAsStrings.kt</file>
-        <line>2</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="combinesNonStringsAsStrings.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
-    <problem>
-        <file>combineEmptyStrings.kt</file>
-        <line>2</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="combineEmptyStrings.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
+
     <problem>
         <file>backslashNMultilineString.kt</file>
         <line>2</line>
@@ -103,12 +16,4 @@
         <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
         <description>Convert concatenation to template</description>
     </problem>
-    <problem>
-        <file>doesNotCorruptExistingTemplate.kt</file>
-        <line>4</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="doesNotCorruptExistingTemplate.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Convert string concatenation to string template</problem_class>
-        <description>Convert concatenation to template</description>
-    </problem>
 </problems>
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/assertStatement/withStringDetail2.kt b/j2k/testData/fileOrElement/assertStatement/withStringDetail2.kt
index 2265730172b..97aa2c8f30f 100644
--- a/j2k/testData/fileOrElement/assertStatement/withStringDetail2.kt
+++ b/j2k/testData/fileOrElement/assertStatement/withStringDetail2.kt
@@ -1 +1 @@
-assert(true) { "string details:$x" }
\ No newline at end of file
+assert(true) { "string details:" + x }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/issues/kt-1074.kt b/j2k/testData/fileOrElement/issues/kt-1074.kt
index b28081de91a..51baf35f29a 100644
--- a/j2k/testData/fileOrElement/issues/kt-1074.kt
+++ b/j2k/testData/fileOrElement/issues/kt-1074.kt
@@ -3,9 +3,9 @@ package demo
 object Test {
     fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
         if (fromIndex < 0)
-            throw IndexOutOfBoundsException("fromIndex = $fromIndex")
+            throw IndexOutOfBoundsException("fromIndex = " + fromIndex)
         if (toIndex > size)
-            throw IndexOutOfBoundsException("toIndex = $toIndex")
+            throw IndexOutOfBoundsException("toIndex = " + toIndex)
         if (fromIndex > toIndex)
             throw IllegalArgumentException("fromIndex($fromIndex) > toIndex($toIndex)")
     }
diff --git a/j2k/testData/fileOrElement/overloads/Annotations.kt b/j2k/testData/fileOrElement/overloads/Annotations.kt
index 4fc24c9da90..95b6e100532 100644
--- a/j2k/testData/fileOrElement/overloads/Annotations.kt
+++ b/j2k/testData/fileOrElement/overloads/Annotations.kt
@@ -30,6 +30,6 @@ class A {
     }
 
     public fun f(p: Int) {
-        println("p = $p")
+        println("p = " + p)
     }
 }
diff --git a/j2k/testData/fileOrElement/overloads/Override.kt b/j2k/testData/fileOrElement/overloads/Override.kt
index 9cace0bc255..9fbf7956303 100644
--- a/j2k/testData/fileOrElement/overloads/Override.kt
+++ b/j2k/testData/fileOrElement/overloads/Override.kt
@@ -5,7 +5,7 @@ interface I {
 
 open class A : I {
     override fun foo(i: Int, c: Char, s: String) {
-        println("foo$i$c$s")
+        println("foo" + i + c + s)
     }
 
     public fun foo(i: Int, c: Char) {
diff --git a/j2k/testData/fileOrElement/overloads/Simple.kt b/j2k/testData/fileOrElement/overloads/Simple.kt
index 602a3dc68f2..3378530548b 100644
--- a/j2k/testData/fileOrElement/overloads/Simple.kt
+++ b/j2k/testData/fileOrElement/overloads/Simple.kt
@@ -1,6 +1,6 @@
 class A {
     JvmOverloads fun foo(i: Int, c: Char = 'a', s: String = "") {
-        println("foo$i$c$s")
+        println("foo" + i + c + s)
     }
 
     JvmOverloads fun bar(s: String? = null): Int {