diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
index e1e5ce1244f..c47eda81680 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
@@ -1,4 +1,5 @@
 // !WITH_NEW_INFERENCE
+// SKIP_TXT
 
 class ExcA : Exception()
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.txt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.txt
deleted file mode 100644
index 5ad037379c9..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-package
-
-public fun test10(): kotlin.Unit
-public fun test2(): kotlin.Unit
-public fun test3(): kotlin.Unit
-public fun test4(): kotlin.Unit
-public fun test5(): kotlin.Unit
-public fun test6(): kotlin.Unit
-public fun test7(): kotlin.Unit
-public fun test8(): kotlin.Unit
-public fun test9(): kotlin.Unit
-
-public final class ExcA : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcA()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ExcB : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcB()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/boundedSmartcasts.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/boundedSmartcasts.kt
index 0f2c04389c1..ae60947636d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/boundedSmartcasts.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/boundedSmartcasts.kt
@@ -1,4 +1,5 @@
 // !WTIH_NEW_INFERENCE
+// SKIP_TXT
 
 class ExcA : Exception()
 class ExcB : Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/boundedSmartcasts.txt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/boundedSmartcasts.txt
deleted file mode 100644
index 0a637b835f4..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/boundedSmartcasts.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-package
-
-public fun test0(/*0*/ x: kotlin.Int?): kotlin.Unit
-public fun test1(/*0*/ x: kotlin.Int?): kotlin.Unit
-public fun test2(/*0*/ x: kotlin.Int?): kotlin.Unit
-public fun test3(/*0*/ x: kotlin.Int?): kotlin.Unit
-public fun test5(/*0*/ x: kotlin.Int?): kotlin.Unit
-
-public final class ExcA : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcA()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ExcB : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcB()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/catchRedeclaration.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/catchRedeclaration.kt
index 730ff0e6775..09cd655a7a4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/catchRedeclaration.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/catchRedeclaration.kt
@@ -1,4 +1,5 @@
 // !WTIH_NEW_INFERENCE
+// SKIP_TXT
 
 class MyException : Exception() {
     val myField = "field"
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/catchRedeclaration.txt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/catchRedeclaration.txt
deleted file mode 100644
index df5d3dcfa6b..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/catchRedeclaration.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-package
-
-public fun test1(): kotlin.Unit
-public fun test2(): kotlin.Unit
-public fun test3(): kotlin.Unit
-public fun test4(): kotlin.Unit
-public fun test5(): kotlin.Unit
-
-public final class MyException : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor MyException()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final val myField: kotlin.String = "field"
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public final fun myFun(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.kt
index 72a5ec3dde4..d3e56a84bab 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.kt
@@ -1,5 +1,6 @@
 // !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
+// SKIP_TXT
 // Related issue: KT-28370
 
 class ExcA : Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.txt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.txt
deleted file mode 100644
index 52026a884f5..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-package
-
-public fun test1(/*0*/ s: kotlin.String?): kotlin.Unit
-public fun test2(/*0*/ s: kotlin.String?): kotlin.Unit
-public fun test3(): kotlin.Unit
-public fun test4(): kotlin.Unit
-public fun test5(/*0*/ s: kotlin.String?): kotlin.Unit
-public fun test6(/*0*/ s: kotlin.String?): kotlin.Unit
-
-public final class ExcA : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcA()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ExcB : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcB()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.kt
index 0512099a67e..4aa7fd2bdbf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.kt
@@ -1,6 +1,7 @@
 // !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewDataFlowForTryExpressions
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
+// SKIP_TXT
 // Related issue: KT-28370
 
 class ExcA : Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.txt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.txt
deleted file mode 100644
index 52026a884f5..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-package
-
-public fun test1(/*0*/ s: kotlin.String?): kotlin.Unit
-public fun test2(/*0*/ s: kotlin.String?): kotlin.Unit
-public fun test3(): kotlin.Unit
-public fun test4(): kotlin.Unit
-public fun test5(/*0*/ s: kotlin.String?): kotlin.Unit
-public fun test6(/*0*/ s: kotlin.String?): kotlin.Unit
-
-public final class ExcA : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcA()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ExcB : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcB()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.kt
index de0431eac62..d1bfb3cce10 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.kt
@@ -1,5 +1,6 @@
 // !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
+// SKIP_TXT
 // Related issue: KT-28370
 
 class ExcA : Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.txt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.txt
deleted file mode 100644
index eee9a3ef422..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-package
-
-public fun test1(): kotlin.Unit
-public fun test2(): kotlin.Unit
-public fun test3(): kotlin.Unit
-public fun test4(): kotlin.Unit
-public fun test5(): kotlin.Unit
-public fun test6(/*0*/ s1: kotlin.String?, /*1*/ s2: kotlin.String?): kotlin.Unit
-
-public final class ExcA : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcA()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ExcB : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcB()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
index f8159f6070e..709b97c9b14 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
@@ -1,6 +1,7 @@
 // !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewDataFlowForTryExpressions
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
+// SKIP_TXT
 // Related issue: KT-28370
 
 class ExcA : Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.txt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.txt
deleted file mode 100644
index eee9a3ef422..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-package
-
-public fun test1(): kotlin.Unit
-public fun test2(): kotlin.Unit
-public fun test3(): kotlin.Unit
-public fun test4(): kotlin.Unit
-public fun test5(): kotlin.Unit
-public fun test6(/*0*/ s1: kotlin.String?, /*1*/ s2: kotlin.String?): kotlin.Unit
-
-public final class ExcA : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcA()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ExcB : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcB()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
index 406bf9d4730..23e21dc8dd7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
@@ -1,4 +1,5 @@
 // !WITH_NEW_INFERENCE
+// SKIP_TXT
 
 class ExcA : Exception()
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.txt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.txt
deleted file mode 100644
index 2ce5f9a3352..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-package
-
-public fun test0(): kotlin.collections.List<kotlin.Int>
-public fun test1(): kotlin.collections.Map<kotlin.Int, kotlin.Int>
-public fun test2(): kotlin.collections.Map<kotlin.Int, kotlin.Int>
-
-public final class ExcA : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcA()
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ExcB : kotlin.Exception /* = java.lang.Exception */ {
-    public constructor ExcB(/*0*/ map: kotlin.collections.Map<kotlin.Int, kotlin.Int>)
-    public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public final val map: kotlin.collections.Map<kotlin.Int, kotlin.Int>
-    public open override /*1*/ /*fake_override*/ val message: kotlin.String?
-    public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun getLocalizedMessage(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun getStackTrace(): kotlin.Array<(out) java.lang.StackTraceElement!>!
-    public final override /*1*/ /*fake_override*/ fun getSuppressed(): kotlin.Array<(out) kotlin.Throwable!>!
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun initCause(/*0*/ cause: kotlin.Throwable!): kotlin.Throwable!
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun printStackTrace(/*0*/ s: java.io.PrintWriter!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun setStackTrace(/*0*/ stackTrace: kotlin.Array<(out) java.lang.StackTraceElement!>!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}