diff --git a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args
index 99aa09deb41..55c6c5be4c4 100644
--- a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args
+++ b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args
@@ -1,6 +1,4 @@
--language-version
-1.3
--XXLanguage\:-InlineClasses
-$TESTDATA_DIR$/inlineClass.kt
+$TESTDATA_DIR$/legacySmartCastsAfterTry.kt
 -d
-$TEMP_DIR$
\ No newline at end of file
+$TEMP_DIR$
+-XXLanguage\:-SoundSmartCastsAfterTry
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.out b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.out
index df4112bf9f2..29cfdc344b9 100644
--- a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.out
+++ b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.out
@@ -1,14 +1,13 @@
 warning: ATTENTION!
 This build uses internal compiler arguments:
 
--XXLanguage:-InlineClasses
+-XXLanguage:-SoundSmartCastsAfterTry
 
 This mode is strictly prohibited for production use,
 as no stability/compatibility guarantees are given on
 compiler or generated code. Use it at your own risk!
 
-warning: language version 1.3 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/inlineClass.kt:1:1: error: the feature "inline classes" is disabled
-inline class Foo(val x: Int)
-^
-COMPILATION_ERROR
+compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:2:25: warning: variable 'some' initializer is redundant
+    var some: String? = null
+                        ^
+OK
diff --git a/compiler/testData/cli/jvm/internalArgEmptyFeatureName.args b/compiler/testData/cli/jvm/internalArgEmptyFeatureName.args
index fbab8506710..0ecdc395523 100644
--- a/compiler/testData/cli/jvm/internalArgEmptyFeatureName.args
+++ b/compiler/testData/cli/jvm/internalArgEmptyFeatureName.args
@@ -1,4 +1,4 @@
-$TESTDATA_DIR$/inlineClass.kt
+$TESTDATA_DIR$/legacySmartCastsAfterTry.kt
 -d
 $TEMP_DIR$
 -XXLanguage\:+
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/internalArgEmptyFeatureName.out b/compiler/testData/cli/jvm/internalArgEmptyFeatureName.out
index 43bf7e500ee..c5a05195b90 100644
--- a/compiler/testData/cli/jvm/internalArgEmptyFeatureName.out
+++ b/compiler/testData/cli/jvm/internalArgEmptyFeatureName.out
@@ -8,7 +8,7 @@ as no stability/compatibility guarantees are given on
 compiler or generated code. Use it at your own risk!
 
 warning: empty language feature name for internal argument '-XXLanguage:+'
-compiler/testData/cli/jvm/inlineClass.kt:1:1: error: the feature "inline classes" is only available since language version 1.3
-inline class Foo(val x: Int)
-^
+compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+    some.length
+        ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args
index a1a797d3fce..bc8bfa21c6b 100644
--- a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args
+++ b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args
@@ -1,6 +1,6 @@
-$TESTDATA_DIR$/inlineClass.kt
+$TESTDATA_DIR$/legacySmartCastsAfterTry.kt
 -d
 $TEMP_DIR$
 -language-version
-1.2
--XXLanguage\:+InlineClasses
\ No newline at end of file
+1.1
+-XXLanguage\:+SoundSmartCastsAfterTry
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out
index 9cb34f0a165..44005ca52e5 100644
--- a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out
+++ b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out
@@ -1,11 +1,13 @@
 warning: ATTENTION!
 This build uses internal compiler arguments:
 
--XXLanguage:+InlineClasses
+-XXLanguage:+SoundSmartCastsAfterTry
 
 This mode is strictly prohibited for production use,
 as no stability/compatibility guarantees are given on
 compiler or generated code. Use it at your own risk!
 
-warning: following manually enabled features will force generation of pre-release binaries: InlineClasses
-OK
+compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+    some.length
+        ^
+COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/internalArgMissingModificator.args b/compiler/testData/cli/jvm/internalArgMissingModificator.args
index 7a0d2d6226a..fb83d6f146b 100644
--- a/compiler/testData/cli/jvm/internalArgMissingModificator.args
+++ b/compiler/testData/cli/jvm/internalArgMissingModificator.args
@@ -1,4 +1,4 @@
-$TESTDATA_DIR$/inlineClass.kt
+$TESTDATA_DIR$/legacySmartCastsAfterTry.kt
 -d
 $TEMP_DIR$
--XXLanguage\:InlineClasses
\ No newline at end of file
+-XXLanguage\:SoundSmartCastAfterTry
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/internalArgMissingModificator.out b/compiler/testData/cli/jvm/internalArgMissingModificator.out
index 3a029a6a759..621e19abed3 100644
--- a/compiler/testData/cli/jvm/internalArgMissingModificator.out
+++ b/compiler/testData/cli/jvm/internalArgMissingModificator.out
@@ -1,14 +1,14 @@
 warning: ATTENTION!
 This build uses internal compiler arguments:
 
--XXLanguage:InlineClasses
+-XXLanguage:SoundSmartCastAfterTry
 
 This mode is strictly prohibited for production use,
 as no stability/compatibility guarantees are given on
 compiler or generated code. Use it at your own risk!
 
-warning: incorrect internal argument syntax, missing modificator: -XXLanguage:InlineClasses
-compiler/testData/cli/jvm/inlineClass.kt:1:1: error: the feature "inline classes" is only available since language version 1.3
-inline class Foo(val x: Int)
-^
+warning: incorrect internal argument syntax, missing modificator: -XXLanguage:SoundSmartCastAfterTry
+compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+    some.length
+        ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.args b/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.args
index b67811122ff..48e04c3f8d0 100644
--- a/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.args
+++ b/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.args
@@ -1,4 +1,4 @@
-$TESTDATA_DIR$/inlineClass.kt
+$TESTDATA_DIR$/legacySmartCastsAfterTry.kt
 -d
 $TEMP_DIR$
 -XXLanguage\:+UnknownFeature
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.out b/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.out
index 4e93b7c3f04..a757a1a6d38 100644
--- a/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.out
+++ b/compiler/testData/cli/jvm/internalArgUnrecognizedFeature.out
@@ -8,7 +8,7 @@ as no stability/compatibility guarantees are given on
 compiler or generated code. Use it at your own risk!
 
 warning: unknown language feature 'UnknownFeature' in passed internal argument '-XXLanguage:+UnknownFeature'
-compiler/testData/cli/jvm/inlineClass.kt:1:1: error: the feature "inline classes" is only available since language version 1.3
-inline class Foo(val x: Int)
-^
+compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+    some.length
+        ^
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/internalArgWrongPrefix.args b/compiler/testData/cli/jvm/internalArgWrongPrefix.args
index 4a093e78607..52f4bde1cbe 100644
--- a/compiler/testData/cli/jvm/internalArgWrongPrefix.args
+++ b/compiler/testData/cli/jvm/internalArgWrongPrefix.args
@@ -1,4 +1,4 @@
-$TESTDATA_DIR$/inlineClass.kt
+$TESTDATA_DIR$/legacySmartCastsAfterTry.kt
 -d
 $TEMP_DIR$
--XX\:+InlineClasses
\ No newline at end of file
+-XX\:+SoundSmartCastAfterTry
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/internalArgWrongPrefix.out b/compiler/testData/cli/jvm/internalArgWrongPrefix.out
index 14002b097d7..fe778e3a634 100644
--- a/compiler/testData/cli/jvm/internalArgWrongPrefix.out
+++ b/compiler/testData/cli/jvm/internalArgWrongPrefix.out
@@ -1,5 +1,5 @@
-warning: flag is not supported by this version of the compiler: -XX:+InlineClasses
-compiler/testData/cli/jvm/inlineClass.kt:1:1: error: the feature "inline classes" is only available since language version 1.3
-inline class Foo(val x: Int)
-^
+warning: flag is not supported by this version of the compiler: -XX:+SoundSmartCastAfterTry
+compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:8:9: error: only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
+    some.length
+        ^
 COMPILATION_ERROR