diff --git a/idea/idea-live-templates/testData/anonymous_1.exp.kt b/idea/idea-live-templates/testData/anonymous_1.exp.kt
index 4a7c30f5d47..292e4969fc8 100644
--- a/idea/idea-live-templates/testData/anonymous_1.exp.kt
+++ b/idea/idea-live-templates/testData/anonymous_1.exp.kt
@@ -3,7 +3,7 @@ import javax.swing.SwingUtilities
 fun main(args : Array<String>) {
     SwingUtilities.invokeLater(object : Runnable {
         override fun run() {
-            throw UnsupportedOperationException()
+            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
         }
     })
 }
diff --git a/idea/idea-live-templates/testData/serr.exp.kt b/idea/idea-live-templates/testData/serr.exp.kt
index 94baca416ae..19101ee4a36 100644
--- a/idea/idea-live-templates/testData/serr.exp.kt
+++ b/idea/idea-live-templates/testData/serr.exp.kt
@@ -1,3 +1,3 @@
 fun main(args : Array<String>) {
-    System.err?.println(<caret>)
+    System.err.println(<caret>)
 }
diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
index ac9e7c5cf78..df802db22e0 100644
--- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
+++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt
@@ -21,7 +21,6 @@ import com.intellij.codeInsight.template.TemplateManager
 import com.intellij.codeInsight.template.impl.TemplateManagerImpl
 import com.intellij.codeInsight.template.impl.TemplateState
 import com.intellij.ide.DataManager
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.editor.actionSystem.EditorActionManager
 import com.intellij.testFramework.LightProjectDescriptor
@@ -85,7 +84,7 @@ class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() {
     fun testSoutv() {
         start()
 
-        assertStringItems("ASSERTIONS_ENABLED", "args", "defaultBlockSize", "defaultBufferSize", "minimumBlockSize", "x", "y")
+        assertStringItems("DEFAULT_BUFFER_SIZE", "args", "x", "y")
         typeAndNextTab("y")
 
         checkAfter()
@@ -190,7 +189,7 @@ class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() {
     fun testIter() {
         start()
 
-        assertStringItems("args", "myList", "o", "str", "stream")
+        assertStringItems("args", "myList", "o", "str")
         type("args")
         nextTab(2)