diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt
index d61d34a42e9..dce6163a8aa 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt
@@ -671,7 +671,7 @@ class ControlFlowInformationProvider private constructor(
                 val mainFunctionDetector = MainFunctionDetector(trace.bindingContext, languageVersionSettings)
                 val isMain = owner is KtNamedFunction && mainFunctionDetector.isMain(owner)
                 val functionName = functionDescriptor.name
-                if (isMain
+                if (isMain && !languageVersionSettings.supportsFeature(LanguageFeature.ExtendedMainConvention)
                     || functionDescriptor.isOverridableOrOverrides
                     || owner.hasModifier(KtTokens.OVERRIDE_KEYWORD)
                     || OperatorNameConventions.GET_VALUE == functionName
diff --git a/compiler/testData/codegen/box/diagnostics/vararg/kt4172.kt b/compiler/testData/codegen/box/diagnostics/vararg/kt4172.kt
index 80e1489d641..61c51aeb0b9 100644
--- a/compiler/testData/codegen/box/diagnostics/vararg/kt4172.kt
+++ b/compiler/testData/codegen/box/diagnostics/vararg/kt4172.kt
@@ -3,7 +3,7 @@ fun box(): String {
     return "OK"
 }
 
-fun main(args: Array<String>) {
+fun main(<!UNUSED_PARAMETER!>args<!>: Array<String>) {
     D.foo(array())
 }
 
diff --git a/compiler/testData/diagnostics/tests/OverridenSetterVisibility.kt b/compiler/testData/diagnostics/tests/OverridenSetterVisibility.kt
index 0390e0166f8..a08eab20170 100644
--- a/compiler/testData/diagnostics/tests/OverridenSetterVisibility.kt
+++ b/compiler/testData/diagnostics/tests/OverridenSetterVisibility.kt
@@ -20,7 +20,7 @@ class Test: ATest(), ITest {
         <!CANNOT_CHANGE_ACCESS_PRIVILEGE, SETTER_VISIBILITY_INCONSISTENT_WITH_PROPERTY_VISIBILITY!>internal<!> set(<!UNUSED_PARAMETER!>value<!>) {}
 }
 
-fun main(args: Array<String>) {
+fun main() {
     val test = Test()
     <!INVISIBLE_SETTER!>test.prop<!> = 12
 
diff --git a/compiler/testData/diagnostics/tests/OverridenSetterVisibility.txt b/compiler/testData/diagnostics/tests/OverridenSetterVisibility.txt
index a5c1b6557f2..a83ad905c37 100644
--- a/compiler/testData/diagnostics/tests/OverridenSetterVisibility.txt
+++ b/compiler/testData/diagnostics/tests/OverridenSetterVisibility.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public abstract class ATest {
     public constructor ATest()
diff --git a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
index 330b7c424fd..65ad54eda21 100644
--- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
+++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
@@ -13,7 +13,7 @@ val xsss = foo.<!NO_COMPANION_OBJECT!>X<!>
 val xssss = <!EXPRESSION_EXPECTED_PACKAGE_FOUND!>foo<!>
 val f = { <!NO_COMPANION_OBJECT!>System<!> }
 
-fun main(args : Array<String>) {
+fun main() {
     <!EXPRESSION_EXPECTED_PACKAGE_FOUND!>java<!> = null
     <!NO_COMPANION_OBJECT!>System<!> = null
     <!NO_COMPANION_OBJECT!>System<!>!!
diff --git a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.txt b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.txt
index 4485e026e44..5f4517207f9 100644
--- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.txt
+++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.txt
@@ -10,7 +10,7 @@ package foo {
     public val xss: [ERROR : Type for java.lang.System]
     public val xsss: [ERROR : Type for foo.X]
     public val xssss: [ERROR : Type for foo]
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 
     public final class X {
         public constructor X()
diff --git a/compiler/testData/diagnostics/tests/TypeInference.kt b/compiler/testData/diagnostics/tests/TypeInference.kt
index f32d0200af4..e467af5c690 100644
--- a/compiler/testData/diagnostics/tests/TypeInference.kt
+++ b/compiler/testData/diagnostics/tests/TypeInference.kt
@@ -6,7 +6,7 @@ class C<T>() {
 fun foo(<!UNUSED_PARAMETER!>c<!>: C<Int>) {}
 fun <T> bar() : C<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
-fun main(args : Array<String>) {
+fun main() {
   val <!UNUSED_VARIABLE!>a<!> : C<Int> = C();
   val <!UNUSED_VARIABLE!>x<!> : C<in String> = C()
   val <!UNUSED_VARIABLE!>y<!> : C<out String> = C()
diff --git a/compiler/testData/diagnostics/tests/TypeInference.txt b/compiler/testData/diagnostics/tests/TypeInference.txt
index 812a43b5af6..33e229c1ec2 100644
--- a/compiler/testData/diagnostics/tests/TypeInference.txt
+++ b/compiler/testData/diagnostics/tests/TypeInference.txt
@@ -2,7 +2,7 @@ package
 
 public fun </*0*/ T> bar(): C<T>
 public fun foo(/*0*/ c: C<kotlin.Int>): kotlin.Unit
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final class C</*0*/ T> {
     public constructor C</*0*/ T>()
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.kt b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.kt
index 6160208f955..b87476788ac 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.kt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.kt
@@ -6,7 +6,7 @@ import java.lang.SuppressWarnings as suppresswarnings
 
 <!DEPRECATED_JAVA_ANNOTATION!>@deprecated<!> @suppresswarnings val s: String = "";
 
-<!DEPRECATED_JAVA_ANNOTATION!>@deprecated<!> @suppresswarnings fun main(args : Array<String>) {
+<!DEPRECATED_JAVA_ANNOTATION!>@deprecated<!> @suppresswarnings fun main() {
     System.out.println("Hello, world!")
 }
 
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt
index 2c941e8ce39..6196de21397 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt
@@ -2,7 +2,7 @@ package
 
 package a {
     @field:java.lang.Deprecated @field:java.lang.SuppressWarnings(value = {}) public val s: kotlin.String = ""
-    @java.lang.Deprecated @java.lang.SuppressWarnings(value = {}) public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    @java.lang.Deprecated @java.lang.SuppressWarnings(value = {}) public fun main(): kotlin.Unit
 
     public final class Test {
         public constructor Test(/*0*/ @java.lang.Deprecated s: kotlin.String, /*1*/ @java.lang.SuppressWarnings(value = {}) x: kotlin.Int)
diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
index 1c299776ea8..b70eaf83c0c 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
@@ -4,7 +4,7 @@
 
 fun <T> array1(vararg a : T) = a
 
-fun main(args : Array<String>) {
+fun main() {
     val a = array1("a", "b")
     val b = array1(1, 1)
     join(1)
diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.txt b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.txt
index c350f269ef1..b5d5b80c3a5 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.txt
+++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.txt
@@ -4,4 +4,4 @@ public fun </*0*/ T> array1(/*0*/ vararg a: T /*kotlin.Array<out T>*/): kotlin.A
 public fun join(/*0*/ x: kotlin.Int, /*1*/ vararg a: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.String
 public fun </*0*/ T> joinG(/*0*/ x: kotlin.Int, /*1*/ vararg a: T /*kotlin.Array<out T>*/): kotlin.String
 public fun </*0*/ T : kotlin.Any> joinT(/*0*/ x: kotlin.Int, /*1*/ vararg a: T /*kotlin.Array<out T>*/): T?
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.kt
index 8b4f59abd84..35c6eb87e95 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.kt
@@ -1,4 +1,4 @@
-fun main(args: Array<String>) {
+fun main() {
     "".run {
         <!UNUSED_EXPRESSION!>""<!>
     }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.txt
index faa55514c72..9b2be0ef853 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.txt
@@ -1,4 +1,4 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun </*0*/ T> T.run(/*0*/ f: (T) -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.kt
index 5282b52f47d..18dd330ddb8 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.kt
@@ -11,7 +11,7 @@ fun box(): Int {
     return local()
 }
 
-fun main(args: Array<String>) {
+fun main() {
     box()
 }
 
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.txt
index e456b2fc8e4..6708e786995 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.txt
@@ -2,5 +2,5 @@ package
 
 package f {
     public fun box(): kotlin.Int
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.kt
index d3f980e3c4d..9177ecf7b61 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.kt
@@ -1,6 +1,6 @@
 //KT-2369 Variable is not marked as uninitialized in 'finally' section
 
-fun main(args: Array<String>) {
+fun main() {
     var x : Int
     try {
         throw Exception()
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.txt
index 8bfb568773c..64bf42f6557 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.txt
@@ -1,4 +1,4 @@
 package
 
 public fun doSmth(/*0*/ a: kotlin.Any?): kotlin.Any?
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.kt
index f7e958af0be..8c5ba56b94f 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.kt
@@ -2,7 +2,7 @@
 
 package kt843
 
-fun main(args : Array<String>) {
+fun main() {
     // Integer type
     val<!SYNTAX!><!> // this word is grey, which looks strange
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.txt
index af0fb625d04..5e1eac7c652 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.txt
@@ -1,5 +1,5 @@
 package
 
 package kt843 {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith12.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith12.kt
new file mode 100644
index 00000000000..802dad22d26
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith12.kt
@@ -0,0 +1,5 @@
+// !LANGUAGE: -ExtendedMainConvention
+
+fun main(args: Array<String>) {
+
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith12.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith12.txt
new file mode 100644
index 00000000000..49ba831837b
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith12.txt
@@ -0,0 +1,3 @@
+package
+
+public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith13.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith13.kt
new file mode 100644
index 00000000000..b4e489385c5
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith13.kt
@@ -0,0 +1,3 @@
+fun main(<!UNUSED_PARAMETER!>args<!>: Array<String>) {
+
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith13.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith13.txt
new file mode 100644
index 00000000000..49ba831837b
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith13.txt
@@ -0,0 +1,3 @@
+package
+
+public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/controlStructures/catchingLocalClassesCapturingTypeParameters.kt b/compiler/testData/diagnostics/tests/controlStructures/catchingLocalClassesCapturingTypeParameters.kt
index 2663318fe40..98948b108d9 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/catchingLocalClassesCapturingTypeParameters.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/catchingLocalClassesCapturingTypeParameters.kt
@@ -15,7 +15,7 @@ fun <T> foo(x: Throwable, z: T, b: (T) -> Unit) {
     }
 }
 
-fun main(args: Array<String>) {
+fun main() {
     foo(RuntimeException(), 1) { throw IllegalStateException() }
     foo(global!!, "") { it.length } // (*)
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/catchingLocalClassesCapturingTypeParameters.txt b/compiler/testData/diagnostics/tests/controlStructures/catchingLocalClassesCapturingTypeParameters.txt
index 3fd82f3d0b2..ce759502b6e 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/catchingLocalClassesCapturingTypeParameters.txt
+++ b/compiler/testData/diagnostics/tests/controlStructures/catchingLocalClassesCapturingTypeParameters.txt
@@ -3,5 +3,5 @@ package
 package test {
     public var global: kotlin.Throwable?
     public fun </*0*/ T> foo(/*0*/ x: kotlin.Throwable, /*1*/ z: T, /*2*/ b: (T) -> kotlin.Unit): kotlin.Unit
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
index 5833d9c5480..16e2d27af95 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
@@ -4,7 +4,7 @@ package kt770_351_735
 
 
 //KT-770 Reference is not resolved to anything, but is not marked unresolved
-fun main(args : Array<String>) {
+fun main() {
     var i = 0
     when (i) {
         1 -> i--
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.txt b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.txt
index 6ef5d018431..0819b67e71a 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.txt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.txt
@@ -9,7 +9,7 @@ package kt770_351_735 {
     public fun fooWithAnuNullableResult(/*0*/ s: kotlin.String?, /*1*/ name: kotlin.String, /*2*/ optional: kotlin.Boolean): kotlin.Any?
     public fun fooWithAnyArg(/*0*/ arg: kotlin.Any): kotlin.Unit
     public fun fooWithAnyNullableArg(/*0*/ arg: kotlin.Any?): kotlin.Unit
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun test1(): kotlin.Unit
     public fun test2(): kotlin.Unit
     public fun testCoercionToAny(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
index 8164d2d65bc..a32cc11b30f 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
@@ -56,7 +56,7 @@ import outer.*
         fun Any?.equals1(<!UNUSED_PARAMETER!>other<!> : Any?) : Boolean = true
         fun Any.equals2(<!UNUSED_PARAMETER!>other<!> : Any?) : Boolean = true
 
-        fun main(args: Array<String>) {
+        fun main() {
 
             System.out.print(1)
 
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.txt b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.txt
index 56e78c9328a..926da7dc91f 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.txt
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.txt
@@ -1,7 +1,7 @@
 package
 
 package null_safety {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun parse(/*0*/ cmd: kotlin.String): null_safety.Command?
     public fun kotlin.Any.equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public fun kotlin.Any?.equals1(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt b/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt
index 6778e30a9bc..fdb80f439aa 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt
@@ -27,7 +27,7 @@ operator fun <T : Any> T?.iterator() = object : MyIterator<T> {
     }
 }
 
-fun main(args : Array<String>) {
+fun main() {
   val i : Int? = 1
   for (x in i) {
     System.out.println(x)
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator.txt b/compiler/testData/diagnostics/tests/extensions/GenericIterator.txt
index 8bc2427b35c..90851a7a73e 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator.txt
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public operator fun </*0*/ T : kotlin.Any> T?.iterator(): MyIterator<T>
 public fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.collections.Iterator<T>
 
diff --git a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt
index 261eb3a2266..5b5862e9dae 100644
--- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt
+++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt
@@ -8,7 +8,7 @@ class Foo {
     companion object : JPAEntityClass<Foo>
 }
 
-fun main(args: Array<String>) {
+fun main() {
     with("", {
         Foo.<!UNRESOLVED_REFERENCE!>findByName<!>("")
     })
diff --git a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt
index 372c8a96c45..0f676a7e2db 100644
--- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt
+++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final class Foo {
     public constructor Foo()
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.kt b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.kt
index 11a06ccb799..2bd119d8607 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.kt
@@ -9,7 +9,7 @@ public interface Predicate<T extends CharSequence> {
 }
 // FILE: Main.kt
 fun process(<!UNUSED_PARAMETER!>x<!>: Predicate<String>) {}
-fun main(args: Array<String>) {
+fun main() {
     process(Predicate { x -> x checkType { _<String>() }
         true
     })
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt
index 3cf68d4a0f0..0451082b357 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun process(/*0*/ x: Predicate<kotlin.String>): kotlin.Unit
 
 public interface Predicate</*0*/ T : kotlin.CharSequence!> {
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt2906.kt b/compiler/testData/diagnostics/tests/functionLiterals/kt2906.kt
index 6634b46c0fc..63c81f0c12d 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt2906.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt2906.kt
@@ -14,7 +14,7 @@ public fun foo2(bar: () -> Unit) {
     }
 }
 
-fun main(args: Array<String>) {
+fun main() {
     foo1 { println ("foo1")} // prints "foo1"
     foo2 { println ("foo2")} // prints "foo2"
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt2906.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt2906.txt
index 01c4c4becba..2de0e067ac7 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt2906.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt2906.txt
@@ -3,6 +3,6 @@ package
 package bug {
     public fun foo1(/*0*/ bar: () -> kotlin.Unit): kotlin.Unit
     public fun foo2(/*0*/ bar: () -> kotlin.Unit): kotlin.Unit
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun println(/*0*/ s: kotlin.String): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt3343.kt b/compiler/testData/diagnostics/tests/functionLiterals/kt3343.kt
index aa1a95a8bb2..66937144aab 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt3343.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt3343.kt
@@ -1,6 +1,6 @@
 // KT-3343 Type mismatch when function literal consists of try-catch with Int returning call, and Unit is expected
 
-fun main(args : Array<String>) {
+fun main() {
     "hello world".prt{
         try{
             print(it)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt3343.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt3343.txt
index 30a4baa2955..5f3c6a54f39 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt3343.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt3343.txt
@@ -1,6 +1,6 @@
 package
 
 public fun log(/*0*/ str: kotlin.String): kotlin.Int
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun print(/*0*/ obj: kotlin.Any): kotlin.Unit
 public fun kotlin.String.prt(/*0*/ action: (kotlin.String) -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt4529.kt b/compiler/testData/diagnostics/tests/functionLiterals/kt4529.kt
index 00cf35a4f33..886f4b9ebdc 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt4529.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt4529.kt
@@ -4,7 +4,7 @@ class G {
     infix fun foo(bar: (Int) -> Int) = bar
 }
 
-fun main(args: Array<String>) {
+fun main() {
     use(
             G().foo {it + 11} // no error
     )
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt4529.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt4529.txt
index 279882f449d..c43f8988bc6 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt4529.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt4529.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun use(/*0*/ a: kotlin.Any?): kotlin.Any?
 
 public final class G {
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt6869.kt b/compiler/testData/diagnostics/tests/functionLiterals/kt6869.kt
index 644d03be805..06a30527764 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt6869.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt6869.kt
@@ -1,4 +1,4 @@
-fun main(args : Array<String>) {
+fun main() {
     var list = listOf(1)
 
     val a: Int? = 2
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt6869.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt6869.txt
index d8419bacd40..9b993ff857d 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt6869.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt6869.txt
@@ -1,5 +1,5 @@
 package
 
 public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.List<T>
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public operator fun </*0*/ T> kotlin.collections.Iterable<T>.plus(/*0*/ element: T): kotlin.collections.List<T>
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.kt b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.kt
index 0d445a178aa..da0361179e8 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.kt
@@ -1,4 +1,4 @@
-fun main(args: Array<String>) {
+fun main() {
     "".run {
         <!UNUSED_LAMBDA_EXPRESSION!>{}<!>
     }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.txt b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.txt
index faa55514c72..9b2be0ef853 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.txt
@@ -1,4 +1,4 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun </*0*/ T> T.run(/*0*/ f: (T) -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/generics/kt9203.kt b/compiler/testData/diagnostics/tests/generics/kt9203.kt
index e7503e713fd..83f420d2152 100644
--- a/compiler/testData/diagnostics/tests/generics/kt9203.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt9203.kt
@@ -4,7 +4,7 @@
 import java.util.stream.Collectors
 import java.util.stream.IntStream
 
-fun main(args: Array<String>) {
+fun main() {
     val xs = IntStream.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>range<!>(0, 10).mapToObj { it.toString() }
             .collect(Collectors.toList())
     xs[0]
diff --git a/compiler/testData/diagnostics/tests/generics/kt9203.txt b/compiler/testData/diagnostics/tests/generics/kt9203.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/tests/generics/kt9203.txt
+++ b/compiler/testData/diagnostics/tests/generics/kt9203.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/generics/kt9203_1.kt b/compiler/testData/diagnostics/tests/generics/kt9203_1.kt
index a4f970b5450..369d4f017d6 100644
--- a/compiler/testData/diagnostics/tests/generics/kt9203_1.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt9203_1.kt
@@ -11,7 +11,7 @@ interface Stream<T> {
 }
 fun stream(): Stream<String> = null!!
 
-fun main(args: Array<String>) {
+fun main() {
     val stream: Stream<String> = stream()
     val xs = stream.collect(toList())
     xs.foo()
diff --git a/compiler/testData/diagnostics/tests/generics/kt9203_1.txt b/compiler/testData/diagnostics/tests/generics/kt9203_1.txt
index abf6c1247f9..820b6205ca9 100644
--- a/compiler/testData/diagnostics/tests/generics/kt9203_1.txt
+++ b/compiler/testData/diagnostics/tests/generics/kt9203_1.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun stream(): Stream<kotlin.String>
 public fun </*0*/ T> toList(): Collector<T, A<T>>
 
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.kt
index 99ba3fd5832..44c46edf58d 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.kt
@@ -5,7 +5,7 @@ import java.util.ArrayList
 
 class ListOfLists<T>(public val x : ArrayList<ArrayList<T>>)
 
-fun main(args : Array<String>) {
+fun main() {
     val a : ArrayList<ArrayList<String>> = ArrayList()
     val b : ListOfLists<String> = ListOfLists(a)
     val c : ListOfLists<*> = b
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.txt b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.txt
index 9e283e3e56e..c35a1d8b2cb 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.txt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final class ListOfLists</*0*/ T> {
     public constructor ListOfLists</*0*/ T>(/*0*/ x: java.util.ArrayList<java.util.ArrayList<T>>)
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.kt b/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.kt
index 363bd2d7842..28f07365aa7 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.kt
@@ -1,6 +1,6 @@
 package b
 
-fun main(args : Array<String>) {
+fun main() {
     var ints : Array<Int?> = arrayOfNulls<Int>(31)
 
     ints[0] = 4; ints[11] = 5; ints[2] =7
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.txt b/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.txt
index c1d57bf1597..cec045cfcd3 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.txt
@@ -1,5 +1,5 @@
 package
 
 package b {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
index 3913636d7a1..046140690d5 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 package bar
 
-fun main(args : Array<String>) {
+fun main() {
     class Some
 
     <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NO_COMPANION_OBJECT!>Some<!>[<!SYNTAX!><!>]<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>names<!> <!DEBUG_INFO_MISSING_UNRESOLVED!><!SYNTAX!>=<!> ["ads"]<!>
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.txt
index 58d3dc550b5..a46f4432d26 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.txt
@@ -1,5 +1,5 @@
 package
 
 package bar {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt
index 48172de15ff..40df42b7275 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt
@@ -10,7 +10,7 @@ class Square() {
   private set
 }
 
-fun main(args : Array<String>) {
+fun main() {
   val s = Square()
 
   s.size = 2.0
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.txt
index 8d3da9635c0..a4146343148 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.txt
@@ -1,7 +1,7 @@
 package
 
 package h {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 
     public final class Square {
         public constructor Square()
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt b/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt
index 9ccdb43915b..575dd3168f6 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt
@@ -7,7 +7,7 @@ fun sum(a : IntArray) : Int {
     for (e in a)
         <!UNRESOLVED_REFERENCE!>res<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>+=<!><!SYNTAX!><!>
 }
-fun main(args : Array<String>) {
+fun main() {
     test(0)
     test(1, 1)
     test(-1, -1, 0)
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.txt b/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.txt
index 6145543d1c6..c5270398a72 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.txt
@@ -2,7 +2,7 @@ package
 
 package sum {
     public fun </*0*/ T : kotlin.Any> assertEquals(/*0*/ actual: T?, /*1*/ expected: T?, /*2*/ message: kotlin.Any? = ...): kotlin.Unit
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun sum(/*0*/ a: kotlin.IntArray): kotlin.Int
     public fun test(/*0*/ expectedSum: kotlin.Int, /*1*/ vararg data: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/kt1293.kt b/compiler/testData/diagnostics/tests/inference/kt1293.kt
index 023ab7228f0..bc4bc63e5ea 100644
--- a/compiler/testData/diagnostics/tests/inference/kt1293.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt1293.kt
@@ -3,7 +3,7 @@
 
 package kt1293
 
-fun main(args : Array<String>) {
+fun main() {
     val intArray = arrayOfNulls<Int>(10)
     val <!UNUSED_VARIABLE!>i<!> : Int = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>intArray[0]<!>
     requiresInt(<!TYPE_MISMATCH!>intArray[0]<!>)
diff --git a/compiler/testData/diagnostics/tests/inference/kt1293.txt b/compiler/testData/diagnostics/tests/inference/kt1293.txt
index bde13c89d8b..5df90086220 100644
--- a/compiler/testData/diagnostics/tests/inference/kt1293.txt
+++ b/compiler/testData/diagnostics/tests/inference/kt1293.txt
@@ -1,6 +1,6 @@
 package
 
 package kt1293 {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun requiresInt(/*0*/ i: kotlin.Int): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/kt3184.kt b/compiler/testData/diagnostics/tests/inference/kt3184.kt
index f92985197d6..227942a690a 100644
--- a/compiler/testData/diagnostics/tests/inference/kt3184.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt3184.kt
@@ -7,7 +7,7 @@ private fun <T> test(value: T, extf: String.(value: T)->Unit) {
     "".extf(value)
 }
 
-fun main(args: Array<String>) {
+fun main() {
     test(1, {value -> println(value)})
 }
 
diff --git a/compiler/testData/diagnostics/tests/inference/kt3184.txt b/compiler/testData/diagnostics/tests/inference/kt3184.txt
index da83089fe47..47c71d07d2c 100644
--- a/compiler/testData/diagnostics/tests/inference/kt3184.txt
+++ b/compiler/testData/diagnostics/tests/inference/kt3184.txt
@@ -1,7 +1,7 @@
 package
 
 package a {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
     private fun </*0*/ T> test(/*0*/ value: T, /*1*/ extf: kotlin.String.(value: T) -> kotlin.Unit): kotlin.Unit
     public fun tests(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
index 6f355876936..7718028a1cf 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
@@ -5,6 +5,6 @@ package d
 
 fun <T> asList(<!UNUSED_PARAMETER!>t<!>: T) : List<T>? {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
-fun main(args : Array<String>) {
+fun main() {
     val <!UNUSED_VARIABLE!>list<!> : List<String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>asList("")<!>
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.txt
index b998d532368..ee58f1b1a6b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.txt
@@ -2,5 +2,5 @@ package
 
 package d {
     public fun </*0*/ T> asList(/*0*/ t: T): kotlin.collections.List<T>?
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
index c2f264b655f..3b09028dc2b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
@@ -4,7 +4,7 @@
 //KT-2200 array(array()) breaks compiler
 package n
 
-fun main(args: Array<String>) {
+fun main() {
     val <!UNUSED_VARIABLE!>a<!> = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>array<!>(<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>array<!>())
     val <!UNUSED_VARIABLE!>a0<!> : Array<Array<Int>> = array(array())
     val a1 = array(array<Int>())
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.txt
index 317554c913b..71c2219274e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.txt
@@ -2,5 +2,5 @@ package
 
 package n {
     @kotlin.Suppress(names = {"UNCHECKED_CAST"}) public fun </*0*/ T> array(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.Array<T>
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt
index cca893ee9e0..6f3cdeb2bb1 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt
@@ -3,7 +3,7 @@
 //KT-2445 Calling method with function with generic parameter causes compile-time exception
 package a
 
-fun main(args: Array<String>) {
+fun main() {
     <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test<!> {
 
     }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.txt
index d3c991e1135..4ecf07325e3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.txt
@@ -1,6 +1,6 @@
 package
 
 package a {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun </*0*/ R> test(/*0*/ callback: (R) -> kotlin.Unit): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2514.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2514.kt
index 09b136ad5e6..090534551cd 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2514.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2514.kt
@@ -8,7 +8,7 @@ fun <T> Thread.use(block: Thread.() -> T): T = block()
 
 fun <T: Closeable, R> T.use(block: (T)-> R) : R = block(this)
 
-fun main(args: Array<String>) {
+fun main() {
     Thread().use { }            // compilation error: Type inference failed
     Thread().use { 5 + 5 }      // compilation error: Type inference failed
     Thread().use<Unit> { }      // compiles okay
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2514.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2514.txt
index 06d23fb1120..cbd68c03be7 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2514.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2514.txt
@@ -1,7 +1,7 @@
 package
 
 package kt2514 {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun </*0*/ T : java.io.Closeable, /*1*/ R> T.use(/*0*/ block: (T) -> R): R
     public fun </*0*/ T> java.lang.Thread.use(/*0*/ block: java.lang.Thread.() -> T): T
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt
index ff8fb60ad8c..a0a226dd8a7 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt
@@ -7,7 +7,7 @@ public inline fun <T: Closeable, R> T.use1(block: (T)-> R) : R {
     return block(this)
 }
 
-fun main(args: Array<String>) {
+fun main() {
     C().use1 {
         <!UNUSED_ANONYMOUS_PARAMETER!>w<!> ->  // ERROR here
         <!UNRESOLVED_REFERENCE!>x<!>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.txt
index e3ff01ae554..f614c5fe3e0 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.txt
@@ -1,7 +1,7 @@
 package
 
 package a {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public inline fun </*0*/ T : a.Closeable, /*1*/ R> T.use1(/*0*/ block: (T) -> R): R
 
     public final class C : a.Closeable {
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt
index 031c92f9445..52a57a5ffbf 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt
@@ -4,7 +4,7 @@
 class Foo<T>
 fun <T> Foo<T>.bar(): T = throw Exception()
 
-fun main(args: Array<String>) {
+fun main() {
     val f: Foo<out String> = Foo()
     f.bar() checkType { _<String>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt4420.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt4420.txt
index 925dd0a4a25..dad03aafb54 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt4420.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt4420.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun </*0*/ T> Foo<T>.bar(): T
 
 public final class Foo</*0*/ T> {
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
index b9029b23fdf..5cc531a56b1 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
@@ -12,7 +12,7 @@ fun <T, G> A<T>.foo(x: (T)-> G): G {
     return x(this.p)
 }
 
-fun main(args: Array<String>) {
+fun main() {
     val a = A(1)
     val t: String = <!NI;TYPE_MISMATCH!>a.<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>foo({p -> <!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH!>p<!>})<!><!>
     checkSubtype<String>(t)
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt731.txt
index 54a1a523374..3fb851e2e7e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt731.txt
@@ -1,7 +1,7 @@
 package
 
 package a {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun </*0*/ T, /*1*/ G> a.A<T>.foo(/*0*/ x: (T) -> G): G
 
     public final class A</*0*/ T> {
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.kt
index 782ab51ee80..08cb948bf82 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.kt
@@ -2,7 +2,7 @@ package a
 
 fun <T, R, S> foo(block: (T)-> R, <!UNUSED_PARAMETER!>second<!>: (T)-> S) = block
 
-fun main(args: Array<String>) {
+fun main() {
     val fff = { <!UNUSED_ANONYMOUS_PARAMETER!>x<!>: Int -> <!UNRESOLVED_REFERENCE!>aaa<!> }
     foo(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>fff<!>, { x -> x + 1 })
 }
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.txt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.txt
index 5ded94124aa..9ab84f89f82 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.txt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.txt
@@ -2,5 +2,5 @@ package
 
 package a {
     public fun </*0*/ T, /*1*/ R, /*2*/ S> foo(/*0*/ block: (T) -> R, /*1*/ second: (T) -> S): (T) -> R
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt
index 0cb1b6c2dbf..fef171d9fb0 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt
@@ -7,7 +7,7 @@ fun <T: Closeable, R> T.foo(block: (T)-> R) = block
 
 fun <T: Closeable, R> T.foo(block: (T, T)-> R) = block
 
-fun main(args: Array<String>) {
+fun main() {
     C().foo { // no ambiguity here
         <!UNUSED_ANONYMOUS_PARAMETER!>www<!> ->
         <!UNRESOLVED_REFERENCE!>xs<!>
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.txt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.txt
index 9abca0e5913..5d69aa09afe 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.txt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.txt
@@ -1,7 +1,7 @@
 package
 
 package a {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun </*0*/ T : a.Closeable, /*1*/ R> T.foo(/*0*/ block: (T) -> R): (T) -> R
     public fun </*0*/ T : a.Closeable, /*1*/ R> T.foo(/*0*/ block: (T, T) -> R): (T, T) -> R
 
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.kt
index 24da80ea969..d4ddda6d19a 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.kt
@@ -11,7 +11,7 @@ public inline fun <K,V1, V: V1> Map<K,V>.getOrElse1(key: K, defaultValue: ()-> V
     }
 }
 
-fun main(args: Array<String>) {
+fun main() {
     val map = HashMap<Int, Int>()
     println(map.getOrElse1(2, { null })) // Error
 }
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.txt b/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.txt
index a92d690092b..1f6a8574895 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.txt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.txt
@@ -1,7 +1,7 @@
 package
 
 package d {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
     public inline fun </*0*/ K, /*1*/ V1, /*2*/ V : V1> kotlin.collections.Map<K, V>.getOrElse1(/*0*/ key: K, /*1*/ defaultValue: () -> V1): V1
 }
diff --git a/compiler/testData/diagnostics/tests/inline/localFun.kt b/compiler/testData/diagnostics/tests/inline/localFun.kt
index 7746fb034ab..0e373675cbc 100644
--- a/compiler/testData/diagnostics/tests/inline/localFun.kt
+++ b/compiler/testData/diagnostics/tests/inline/localFun.kt
@@ -1,4 +1,4 @@
-fun main(args: Array<String>) {
+fun main() {
     <!NOT_YET_SUPPORTED_IN_INLINE!>inline<!> fun a(){
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inline/localFun.txt b/compiler/testData/diagnostics/tests/inline/localFun.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/tests/inline/localFun.txt
+++ b/compiler/testData/diagnostics/tests/inline/localFun.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.kt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.kt
index 72c5bde1993..7f79214b51f 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -NOTHING_TO_INLINE
-fun main(args: Array<String>) {
+fun main() {
     test {
         <!RETURN_NOT_ALLOWED!>return<!>
     }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.txt
index a7ceea7051f..5f404b7d9cd 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.txt
@@ -1,4 +1,4 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public inline fun test(/*0*/ noinline lambda: () -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/kt14887.kt b/compiler/testData/diagnostics/tests/inline/nonPublicMember/kt14887.kt
index 817af27886d..157e61f6ec0 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/kt14887.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/kt14887.kt
@@ -3,6 +3,6 @@
     <!UNRESOLVED_REFERENCE!>unresolved<!>().<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>another<!>()
 }
 
-fun main(args: Array<String>) {
+fun main() {
     foo()
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/kt14887.txt b/compiler/testData/diagnostics/tests/inline/nonPublicMember/kt14887.txt
index 6756b166dc1..1a43f5450b6 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/kt14887.txt
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/kt14887.txt
@@ -1,4 +1,4 @@
 package
 
 public inline fun foo(): kotlin.Unit
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.kt b/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.kt
index 670883426d6..4abe3f79e7f 100644
--- a/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.kt
+++ b/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.kt
@@ -16,7 +16,7 @@ public class C implements I {
 
 class K : C()
 
-fun main(args: Array<String>) {
+fun main() {
     I.a
     I.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>foo<!>()
 
diff --git a/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.txt b/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.txt
index 16bce00a637..884137f8f8c 100644
--- a/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.txt
+++ b/compiler/testData/diagnostics/tests/j+k/inheritanceStaticMethodFromInterface.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public open class C : I {
     public constructor C()
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.kt b/compiler/testData/diagnostics/tests/j+k/kt2619.kt
index 89e5b6e623a..914f001fbfb 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2619.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2619.kt
@@ -1,5 +1,5 @@
 //FILE: foo.kt
-fun main(args: Array<String>) {
+fun main() {
     val c: Type
     <!NON_EXHAUSTIVE_WHEN!>when<!> (<!UNINITIALIZED_VARIABLE, UNUSED_EXPRESSION!>c<!>)  {
 
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.txt b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
index b678e4d7909..2988b035d7b 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2619.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final enum class Type : kotlin.Enum<Type!> {
     enum entry TYPE
diff --git a/compiler/testData/diagnostics/tests/j+k/kt3311.kt b/compiler/testData/diagnostics/tests/j+k/kt3311.kt
index 7874ea5c2f0..080e29b9e9b 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt3311.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt3311.kt
@@ -12,7 +12,7 @@ public class Super {
 public class Sub: Super() {
 }
 
-fun main(args: Array<String>) {
+fun main() {
     val x = Sub()
     x.foo = true
     x.bar = true
diff --git a/compiler/testData/diagnostics/tests/j+k/kt3311.txt b/compiler/testData/diagnostics/tests/j+k/kt3311.txt
index e64531082f2..0433440666f 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt3311.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt3311.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final class Sub : Super {
     public constructor Sub()
diff --git a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt
index 11215de4728..5226d9ae86f 100644
--- a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt
+++ b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt
@@ -13,6 +13,6 @@ public class Foo {
 
 // FILE: 1.kt
 
-fun main(args: Array<String>) {
+fun main() {
     javaPackage.Foo.<!INVISIBLE_REFERENCE!>Bar<!>.<!INVISIBLE_MEMBER!>doSmth<!>()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.txt b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.txt
index c924771988b..65c0078108e 100644
--- a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.txt
+++ b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 package javaPackage {
 
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/fakeOverrideFunctionForStaticSam.kt b/compiler/testData/diagnostics/tests/j+k/sam/fakeOverrideFunctionForStaticSam.kt
index b420ad11efc..88ae849b8fb 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/fakeOverrideFunctionForStaticSam.kt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/fakeOverrideFunctionForStaticSam.kt
@@ -14,7 +14,7 @@ public class Observable<T> {
 }
 
 // FILE: 1.kt
-fun main(args: Array<String>) {
+fun main() {
     BehaviorSubject.create<String>(null)
     BehaviorSubject.create<Int> { }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/fakeOverrideFunctionForStaticSam.txt b/compiler/testData/diagnostics/tests/j+k/sam/fakeOverrideFunctionForStaticSam.txt
index 926ca7a00fd..332a1ffea7e 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/fakeOverrideFunctionForStaticSam.txt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/fakeOverrideFunctionForStaticSam.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public open class BehaviorSubject</*0*/ T : kotlin.Any!> : Observable<T!> {
     public constructor BehaviorSubject</*0*/ T : kotlin.Any!>()
diff --git a/compiler/testData/diagnostics/tests/labels/kt3988.kt b/compiler/testData/diagnostics/tests/labels/kt3988.kt
index 252226acd65..ce75c164f3a 100644
--- a/compiler/testData/diagnostics/tests/labels/kt3988.kt
+++ b/compiler/testData/diagnostics/tests/labels/kt3988.kt
@@ -12,7 +12,7 @@ fun new(body: Comment.() -> Unit) = body
 
 fun new2(body: Comment2.() -> Unit) = body
 
-fun main(args: Array<String>) {
+fun main() {
     new {
         new2 {
             <!UNUSED_EXPRESSION!>this@new<!> //UNRESOLVED REFERENCE
diff --git a/compiler/testData/diagnostics/tests/labels/kt3988.txt b/compiler/testData/diagnostics/tests/labels/kt3988.txt
index 9ed4f1e139c..0a20bd75d5c 100644
--- a/compiler/testData/diagnostics/tests/labels/kt3988.txt
+++ b/compiler/testData/diagnostics/tests/labels/kt3988.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun new(/*0*/ body: Comment.() -> kotlin.Unit): Comment.() -> kotlin.Unit
 public fun new2(/*0*/ body: Comment2.() -> kotlin.Unit): Comment2.() -> kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt
index 44ab59dbf82..9253493b908 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt
@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
-fun main(args : Array<String>) {
+fun main() {
     val a : Int? = null
     val b : Int? = null
     checkSubtype<Int>(a!!)
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.kt
index 9d1bf0184c2..e28faf8df67 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.kt
@@ -3,7 +3,7 @@ class Foo {
     fun foo(a: Foo): Foo = a
 }
 
-fun main(args : Array<String>) {
+fun main() {
     val x: Foo? = null
     val y: Foo? = null
     
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.txt
index 154971f95f0..585dcd4ad75 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final class Foo {
     public constructor Foo()
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt
index 948e0736611..8037571281d 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt
@@ -4,7 +4,7 @@ package kt2164
 
 fun foo(x: Int): Int = x + 1
 
-fun main(args : Array<String>) {
+fun main() {
     val x: Int? = null
 
     foo(<!TYPE_MISMATCH!>x<!>)
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.txt
index d76adb0c4a8..9bfbc64292b 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.txt
@@ -2,5 +2,5 @@ package
 
 package kt2164 {
     public fun foo(/*0*/ x: kotlin.Int): kotlin.Int
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.kt
index d9520a9b946..beda714b3e3 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.kt
@@ -1,7 +1,7 @@
 //KT-2212 Incomplete nullability information
 package kt2212
 
-fun main(args: Array<String>) {
+fun main() {
     val x: Int? = 1
     if (x == null) return
     System.out.println(<!DEBUG_INFO_SMARTCAST!>x<!>.plus(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>))
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.txt
index 1b4038118af..69ee20dcab9 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.txt
@@ -1,5 +1,5 @@
 package
 
 package kt2212 {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt
index 742164f5c12..cbd456c235f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt
@@ -6,7 +6,7 @@ package a
 
 class Pair<A, B>(val a: A, val b: B)
 
-fun main(args : Array<String>) {
+fun main() {
     val d : Long = 1
     val period : Int? = null
     if (period != null) Pair(d, checkSubtype<Int>(period<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)) else Pair(d, 1)
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.txt
index ee63fcd7a29..445aa690e9b 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.txt
@@ -2,7 +2,7 @@ package
 
 package a {
     public fun foo(): kotlin.Unit
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 
     public final class Pair</*0*/ A, /*1*/ B> {
         public constructor Pair</*0*/ A, /*1*/ B>(/*0*/ a: A, /*1*/ b: B)
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt
index 5cdf69e1239..478f85f9661 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt
@@ -1,4 +1,4 @@
-fun main(args: Array<String>) {
+fun main() {
     val b: Boolean? = null
     if (b != null) {
         if (!<!DEBUG_INFO_SMARTCAST!>b<!>) {} // OK
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.txt
index 2c0bb7125f7..045444ddcf6 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.txt
@@ -1,4 +1,4 @@
 package
 
 public fun foo(/*0*/ a: kotlin.Boolean): kotlin.Boolean
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
index 6b22a625044..74bd4f14a30 100644
--- a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
+++ b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
@@ -5,7 +5,7 @@ fun foo(i: Int) = i
 
 fun bar(l: Long) = l
 
-fun main(args: Array<String>) {
+fun main() {
     val <!UNUSED_VARIABLE!>i<!> = <!INT_LITERAL_OUT_OF_RANGE!>111111111111111777777777777777<!>
 
     //todo add diagnostic text messages
diff --git a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.txt b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.txt
index 65d2ad07882..e9e41953d3c 100644
--- a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.txt
+++ b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.txt
@@ -3,5 +3,5 @@ package
 package a {
     public fun bar(/*0*/ l: kotlin.Long): kotlin.Long
     public fun foo(/*0*/ i: kotlin.Int): kotlin.Int
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt
index 01c21dfca63..f50f94e395c 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt
@@ -3,7 +3,7 @@ class A {
     fun set(<!UNUSED_PARAMETER!>x<!>: Int, <!UNUSED_PARAMETER!>y<!>: Int) {} // no `operator` modifier
 }
 
-fun main(args: Array<String>) {
+fun main() {
     val a = A()
     <!OPERATOR_MODIFIER_REQUIRED!>a[1]<!>++
     <!OPERATOR_MODIFIER_REQUIRED!>a[1]<!> += 3
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.txt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.txt
index 071043791c7..48a0595d63a 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.txt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final class A {
     public constructor A()
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13349.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13349.kt
index 4b1fe702fb0..e2cb9f6115d 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13349.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13349.kt
@@ -2,6 +2,6 @@ object Foo {
     operator fun <T> invoke() {}
 }
 
-fun main(args: Array<String>) {
+fun main() {
     Foo<Int>()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13349.txt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13349.txt
index 2c22677a3ce..2cdbb31627c 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13349.txt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13349.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public object Foo {
     private constructor Foo()
diff --git a/compiler/testData/diagnostics/tests/overload/kt2493.kt b/compiler/testData/diagnostics/tests/overload/kt2493.kt
index c9c2ba17554..27edddd87fa 100644
--- a/compiler/testData/diagnostics/tests/overload/kt2493.kt
+++ b/compiler/testData/diagnostics/tests/overload/kt2493.kt
@@ -13,7 +13,7 @@ class BImpl: B
 
 class C: A, B
 
-fun main(args: Array<String>) {
+fun main() {
     AImpl().f()
     BImpl().f()
     C().<!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>f<!>()
diff --git a/compiler/testData/diagnostics/tests/overload/kt2493.txt b/compiler/testData/diagnostics/tests/overload/kt2493.txt
index fc1d2de1c02..d107d0327ab 100644
--- a/compiler/testData/diagnostics/tests/overload/kt2493.txt
+++ b/compiler/testData/diagnostics/tests/overload/kt2493.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun </*0*/ R : A> R.f(): kotlin.Unit
 public fun </*0*/ R : B> R.f(): kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.kt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.kt
index 33ab0921e77..907f324a43b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.kt
@@ -12,7 +12,7 @@ import p.*
 
 fun foo(): J? = null
 
-fun main(args: Array<String>) {
+fun main() {
     val v = foo() ?: J.j()
     if (v != null) {
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.txt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.txt
index df7ac041bc1..8d4acc95729 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.txt
@@ -1,7 +1,7 @@
 package
 
 public fun foo(): p.J?
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 package p {
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.kt b/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.kt
index 593085cf2d9..2d3b7398878 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.kt
@@ -20,6 +20,6 @@ class KotlinDerived2 : Derived() {
     override fun <V: Any> foo() {}
 }
 
-fun main(args: Array<String>) {
+fun main() {
     Derived().foo<String>()
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.txt b/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.txt
index 01e05c42aba..91ba7fd736d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public interface Base {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInFile.kt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInFile.kt
index 8e526c11a0c..018f44808a6 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInFile.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInFile.kt
@@ -1,4 +1,4 @@
 // KT-9733 No error shown for 2 "main" functions in the same file
 
-<!CONFLICTING_OVERLOADS!>fun main(args: Array<String>)<!> {}
-<!CONFLICTING_OVERLOADS!>fun main(args: Array<String>)<!> {}
\ No newline at end of file
+<!CONFLICTING_OVERLOADS!>fun main(<!UNUSED_PARAMETER!>args<!>: Array<String>)<!> {}
+<!CONFLICTING_OVERLOADS!>fun main(<!UNUSED_PARAMETER!>args<!>: Array<String>)<!> {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.kt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.kt
index 315f24d42af..b98f96fdc4e 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.kt
@@ -1,5 +1,5 @@
 // FILE: a.kt
-fun main(args: Array<String>) {}
+fun main() {}
 
 // FILE: b.kt
-fun main(args: Array<String>) {}
\ No newline at end of file
+fun main() {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.txt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.txt
index abafee5d3ef..0bff3544466 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.txt
@@ -1,4 +1,4 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationParameterlessMainInvalid.kt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationParameterlessMainInvalid.kt
index e94e65a7955..3a65ef92bd7 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationParameterlessMainInvalid.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationParameterlessMainInvalid.kt
@@ -1,7 +1,7 @@
 // FILE: a.kt
 <!CONFLICTING_OVERLOADS!>fun main()<!> {}
 
-suspend fun main(args: Array<String>) {}
+suspend fun main(<!UNUSED_PARAMETER!>args<!>: Array<String>) {}
 
 // FILE: b.kt
 <!CONFLICTING_OVERLOADS!>fun main()<!> {}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationSuspendMainInMultiFile.kt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationSuspendMainInMultiFile.kt
index 394e00f5523..edb92ec06bf 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationSuspendMainInMultiFile.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationSuspendMainInMultiFile.kt
@@ -1,5 +1,5 @@
 // FILE: a.kt
-suspend fun main(args: Array<String>) {}
+suspend fun main() {}
 
 // FILE: b.kt
-suspend fun main(args: Array<String>) {}
+suspend fun main() {}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationSuspendMainInMultiFile.txt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationSuspendMainInMultiFile.txt
index 6b214ad3854..610f01adc41 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationSuspendMainInMultiFile.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationSuspendMainInMultiFile.txt
@@ -1,4 +1,4 @@
 package
 
-public suspend fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
-public suspend fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public suspend fun main(): kotlin.Unit
+public suspend fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.kt b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.kt
index ec6819ebe08..20b6cb77286 100644
--- a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.kt
+++ b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.kt
@@ -37,7 +37,7 @@ fun evaluate(expr: StringBuilder, numbers: ArrayList<Int>): Int {
   return lhs
 }
 
-fun main(args: Array<String>) {
+fun main() {
   System.out.println("24 game")
   val numbers = ArrayList<Int>(4)
   val rnd = Random();
diff --git a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.txt b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.txt
index d25282cfc82..aa6e586cb62 100644
--- a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.txt
+++ b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.txt
@@ -3,5 +3,5 @@ package
 public fun evaluate(/*0*/ expr: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ numbers: java.util.ArrayList<kotlin.Int>): kotlin.Int
 public fun evaluateAdd(/*0*/ expr: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ numbers: java.util.ArrayList<kotlin.Int>): kotlin.Int
 public fun evaluateArg(/*0*/ expr: kotlin.CharSequence, /*1*/ numbers: java.util.ArrayList<kotlin.Int>): kotlin.Int
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun takeFirst(/*0*/ expr: kotlin.text.StringBuilder /* = java.lang.StringBuilder */): kotlin.Char
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet69.kt b/compiler/testData/diagnostics/tests/regressions/Jet69.kt
index 85a6bf396dc..650edef408e 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet69.kt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet69.kt
@@ -4,7 +4,7 @@ fun parse(<!UNUSED_PARAMETER!>cmd<!>: String): Command? { return null  }
 
 fun Any.<!EXTENSION_SHADOWED_BY_MEMBER!>equals<!>(other : Any?) : Boolean = this === other
 
-fun main(args: Array<String>) {
+fun main() {
     val command = parse("")
     if (command == null) <!UNUSED_EXPRESSION!>1<!> // error on this line, but must be OK
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet69.txt b/compiler/testData/diagnostics/tests/regressions/Jet69.txt
index e7e121c3272..03dfbff9dbd 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet69.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet69.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun parse(/*0*/ cmd: kotlin.String): Command?
 public fun kotlin.Any.equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
 
diff --git a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.kt b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.kt
index 782de6062e9..7f0041bee43 100644
--- a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.kt
+++ b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.kt
@@ -1,6 +1,6 @@
 fun Any.<!EXTENSION_SHADOWED_BY_MEMBER!>equals<!>(<!UNUSED_PARAMETER!>other<!> : Any?) : Boolean = true
 
-fun main(args: Array<String>) {
+fun main() {
 
     val command : Any = 1
 
diff --git a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.txt b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.txt
index 2e55dcd1e37..9db53dc18bf 100644
--- a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.txt
+++ b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.txt
@@ -1,4 +1,4 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun kotlin.Any.equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt
index 93b072acbf4..48103baa59b 100644
--- a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt
+++ b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-fun main(args : Array<String>) {
+fun main() {
     val a : Int? = null;
     var v = 1
     val <!UNUSED_VARIABLE!>b<!> : String = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>v<!>;
diff --git a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.txt b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.txt
+++ b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/ea40964.kt b/compiler/testData/diagnostics/tests/regressions/ea40964.kt
index 105caef7106..0410edc71ad 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea40964.kt
+++ b/compiler/testData/diagnostics/tests/regressions/ea40964.kt
@@ -2,7 +2,7 @@ package checkFiles
 
 import java.util.HashMap
 
-fun main(args: Array<String>) {
+fun main() {
     val hashMap = HashMap<String, String>()
     hashMap[<!SYNTAX!><!>]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/ea40964.txt b/compiler/testData/diagnostics/tests/regressions/ea40964.txt
index 49a52835c1a..07c1bc3ab50 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea40964.txt
+++ b/compiler/testData/diagnostics/tests/regressions/ea40964.txt
@@ -1,5 +1,5 @@
 package
 
 package checkFiles {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/ea53340.kt b/compiler/testData/diagnostics/tests/regressions/ea53340.kt
index 2233489a722..7205d13137b 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea53340.kt
+++ b/compiler/testData/diagnostics/tests/regressions/ea53340.kt
@@ -2,6 +2,6 @@ class A : Function0<Int> {
     override fun invoke(): Int = 1
 }
 
-fun main(args : Array<String>) {
+fun main() {
     A()()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/regressions/ea53340.txt b/compiler/testData/diagnostics/tests/regressions/ea53340.txt
index c5d0ab1b18d..ff2b3f3acfe 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea53340.txt
+++ b/compiler/testData/diagnostics/tests/regressions/ea53340.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final class A : () -> kotlin.Int {
     public constructor A()
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10633.kt b/compiler/testData/diagnostics/tests/regressions/kt10633.kt
index 195e78990a0..5c71c8b74a0 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10633.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10633.kt
@@ -10,7 +10,7 @@ operator fun Int.get(s: Int): Int {
 operator fun Int.set(s: Int, x: String = "", z: Int) {
 }
 
-fun main(args: Array<String>) {
+fun main() {
     1[2] = 1
     1.set(2, z = 1)
     1[2] += 1
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10633.txt b/compiler/testData/diagnostics/tests/regressions/kt10633.txt
index 90ff23c94f1..a7325a55a54 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10633.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10633.txt
@@ -1,6 +1,6 @@
 package
 
 public var count: kotlin.Int
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public operator fun kotlin.Int.get(/*0*/ s: kotlin.Int): kotlin.Int
 public operator fun kotlin.Int.set(/*0*/ s: kotlin.Int, /*1*/ x: kotlin.String = ..., /*2*/ z: kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt127.kt b/compiler/testData/diagnostics/tests/regressions/kt127.kt
index 2f562c64e0e..883f207faf6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt127.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt127.kt
@@ -4,7 +4,7 @@ class Foo() {}
 
 fun Any?.equals1(<!UNUSED_PARAMETER!>other<!> : Any?) : Boolean = true
 
-fun main(args: Array<String>) {
+fun main() {
 
     val command : Foo? = null
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt127.txt b/compiler/testData/diagnostics/tests/regressions/kt127.txt
index 107609672cc..ec392ae0a0f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt127.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt127.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun kotlin.Any?.equals1(/*0*/ other: kotlin.Any?): kotlin.Boolean
 
 public final class Foo {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1550.kt b/compiler/testData/diagnostics/tests/regressions/kt1550.kt
index 1d8c9923e63..f9bf9dcf7b4 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1550.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt1550.kt
@@ -2,7 +2,7 @@ package foo
 
 import java.util.*
 
-fun main(args : Array<String>)
+fun main()
 {
   val c = ArrayList<Int>()
   c.add(3)
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1550.txt b/compiler/testData/diagnostics/tests/regressions/kt1550.txt
index d1657bea5c1..c9e446870da 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1550.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt1550.txt
@@ -1,5 +1,5 @@
 package
 
 package foo {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt235.kt b/compiler/testData/diagnostics/tests/regressions/kt235.kt
index 5d793fa5859..3e8d0f47a47 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt235.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt235.kt
@@ -2,7 +2,7 @@
 
 package kt235
 
-fun main(args: Array<String>) {
+fun main() {
     val array = MyArray()
     val <!UNUSED_VARIABLE!>f<!>: () -> String = {
         <!EXPECTED_TYPE_MISMATCH!>array[2] = 23<!> //error: Type mismatch: inferred type is Int (!!!) but String was expected
diff --git a/compiler/testData/diagnostics/tests/regressions/kt235.txt b/compiler/testData/diagnostics/tests/regressions/kt235.txt
index 5a30ba0be4c..84dd1cf38fd 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt235.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt235.txt
@@ -1,7 +1,7 @@
 package
 
 package kt235 {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 
     public final class MyArray {
         public constructor MyArray()
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2376.kt b/compiler/testData/diagnostics/tests/regressions/kt2376.kt
index f06d169cd41..61acbc6a036 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2376.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt2376.kt
@@ -1,6 +1,6 @@
 // FILE: main.kt
 //KT-2376 java.lang.Number should be visible in Kotlin as kotlin.Number
-fun main(args: Array<String>) {
+fun main() {
     Test().number(5.toInt())
 }
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2376.txt b/compiler/testData/diagnostics/tests/regressions/kt2376.txt
index bb545694475..5a26611e105 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2376.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt2376.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public open class Test {
     public constructor Test()
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2768.kt b/compiler/testData/diagnostics/tests/regressions/kt2768.kt
index 58dc51dedcc..afe608eadbe 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2768.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt2768.kt
@@ -2,7 +2,7 @@ fun <T> assertEquals(a: T, b: T) {
     if (a != b) throw AssertionError("$a != $b")
 }
 
-fun main(args: Array<String>) {
+fun main() {
     val bytePos = 128.toByte() // Byte.MAX_VALUE + 1
     assertEquals(-128, bytePos.toInt()) // correct, wrapped to Byte.MIN_VALUE
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2768.txt b/compiler/testData/diagnostics/tests/regressions/kt2768.txt
index 87eecda345f..0a0f39f7b57 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2768.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt2768.txt
@@ -1,4 +1,4 @@
 package
 
 public fun </*0*/ T> assertEquals(/*0*/ a: T, /*1*/ b: T): kotlin.Unit
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt
index 51e61f83ba7..625e715e707 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt
@@ -27,7 +27,7 @@ fun <T> generic_invoker(gen :  () -> T) : T {
 fun println(message : Int) { System.out.println(message) }
 fun println(message : Long) { System.out.println(message) }
 
-fun main(args : Array<String>) {
+fun main() {
 
     println(run { 1 })
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt
index 2b4ff5594b0..aa49f052c63 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt
@@ -2,7 +2,7 @@ package
 
 public fun box(): kotlin.String
 public fun </*0*/ T> generic_invoker(/*0*/ gen: () -> T): T
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun println(/*0*/ message: kotlin.Int): kotlin.Unit
 public fun println(/*0*/ message: kotlin.Long): kotlin.Unit
 public fun </*0*/ T> kotlin.collections.Iterable<T>.foreach(/*0*/ operation: (element: T) -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt442.kt b/compiler/testData/diagnostics/tests/regressions/kt442.kt
index 887d48959e0..0be9857fe66 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt442.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt442.kt
@@ -24,7 +24,7 @@ infix fun <T> T.with(f :  T.() -> Unit) {
     f()
 }
 
-fun main(args : Array<String>) {
+fun main() {
     val <!UNUSED_VARIABLE!>a<!> = 1 with {
         plus(1)
     }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt442.txt b/compiler/testData/diagnostics/tests/regressions/kt442.txt
index a5602dcb162..d0f80f125b2 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt442.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt442.txt
@@ -4,7 +4,7 @@ public fun box(): kotlin.String
 public fun </*0*/ T> funny(/*0*/ f: () -> T): T
 public fun </*0*/ T> funny2(/*0*/ f: (t: T) -> T): T
 public fun </*0*/ T> generic_invoker(/*0*/ gen: (kotlin.String) -> T): T
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun testFunny(): kotlin.Unit
 public fun testFunny2(): kotlin.Unit
 public infix fun </*0*/ T> T.with(/*0*/ f: T.() -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt524.kt b/compiler/testData/diagnostics/tests/regressions/kt524.kt
index 6bc40754eb1..29b2bf9f13f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt524.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt524.kt
@@ -5,7 +5,7 @@ package StringBuilder
 //import kotlin.io.*
 //import java.io.*
 
-fun main(args : Array<String>) {
+fun main() {
 }
 
 val Int.bd : StringBuilder get() = StringBuilder(this.toString())
diff --git a/compiler/testData/diagnostics/tests/regressions/kt524.txt b/compiler/testData/diagnostics/tests/regressions/kt524.txt
index 7aa4b4bbf05..8234dbec8bf 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt524.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt524.txt
@@ -2,7 +2,7 @@ package
 
 package StringBuilder {
     public val kotlin.Int.bd: kotlin.text.StringBuilder /* = java.lang.StringBuilder */
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
     public fun kotlin.text.StringBuilder /* = java.lang.StringBuilder */.plus(/*0*/ other: kotlin.text.StringBuilder /* = java.lang.StringBuilder */): kotlin.text.StringBuilder /* = java.lang.StringBuilder */
     public fun </*0*/ T : kotlin.Any> T?.sure1(): T
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt618.kt b/compiler/testData/diagnostics/tests/regressions/kt618.kt
index 7326c0e2206..989a75fe3d4 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt618.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt618.kt
@@ -18,7 +18,7 @@ class B() {
     }
 }
 
-fun main(args : Array<String>) {
+fun main() {
     var c = B()
     c <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT!>+=<!> B()
     c <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT!>*=<!> B()
diff --git a/compiler/testData/diagnostics/tests/regressions/kt618.txt b/compiler/testData/diagnostics/tests/regressions/kt618.txt
index c98f346207d..50893d2050b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt618.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt618.txt
@@ -1,7 +1,7 @@
 package
 
 package lol {
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 
     public final class B {
         public constructor B()
diff --git a/compiler/testData/diagnostics/tests/regressions/kt716.kt b/compiler/testData/diagnostics/tests/regressions/kt716.kt
index f4a244447c2..171d8986fc8 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt716.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt716.kt
@@ -11,6 +11,6 @@ fun <T> TypeInfo<T>.getJavaClass() : java.lang.Class<T> {
 
 fun <T> getJavaClass() = typeinfo<T>().getJavaClass()
 
-fun main(args : Array<String>) {
+fun main() {
     System.out.println(getJavaClass<String>())
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/regressions/kt716.txt b/compiler/testData/diagnostics/tests/regressions/kt716.txt
index 8be2d9eb6d6..c230ba5be14 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt716.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt716.txt
@@ -1,7 +1,7 @@
 package
 
 public fun </*0*/ T> getJavaClass(): java.lang.Class<T>
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun </*0*/ T> typeinfo(): TypeInfo<T>
 public fun </*0*/ T> TypeInfo<T>.getJavaClass(): java.lang.Class<T>
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt750.kt b/compiler/testData/diagnostics/tests/regressions/kt750.kt
index b37f565ee9c..8fc9cf40d2f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt750.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt750.kt
@@ -1,5 +1,5 @@
 //KT-750 Type inference failed: Constraint violation
-fun main(args : Array<String>) {
+fun main() {
   var i : Int? = Integer.valueOf(100)
   var s : Int? = Integer.valueOf(100)
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt750.txt b/compiler/testData/diagnostics/tests/regressions/kt750.txt
index c2305f5626f..3b2cd03dd75 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt750.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt750.txt
@@ -1,4 +1,4 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun </*0*/ T : kotlin.Any> T?.sure(): T
diff --git a/compiler/testData/diagnostics/tests/regressions/kt762.kt b/compiler/testData/diagnostics/tests/regressions/kt762.kt
index cbeab3b23b8..f1bfeae266f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt762.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt762.kt
@@ -1,4 +1,4 @@
 //KT-762 Wrong highlighting in imports (No errors reported on unresolved imports)
 import <!UNRESOLVED_REFERENCE!>aaa<!> // must be an error
 
-fun main(args : Array<String>) {}
+fun main() {}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt762.txt b/compiler/testData/diagnostics/tests/regressions/kt762.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt762.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt762.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt
index 80677778fde..ac60e1158bc 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt
@@ -24,7 +24,7 @@ fun @MyDsl A.baz5() {
     }
 }
 
-fun main(args: Array<String>) {
+fun main() {
     baz1 {
         baz2 {
             bar()
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.txt b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.txt
index f2b741aba2f..c9f9b02974d 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.txt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.txt
@@ -4,7 +4,7 @@ public fun baz1(/*0*/ x: (@MyDsl A).() -> kotlin.Unit): kotlin.Unit
 public fun baz2(/*0*/ x: (@MyDsl B).() -> kotlin.Unit): kotlin.Unit
 public fun baz3(/*0*/ x: @MyDsl() (A.() -> kotlin.Unit)): kotlin.Unit
 public fun baz4(/*0*/ x: @MyDsl() (B.() -> kotlin.Unit)): kotlin.Unit
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun @MyDsl A.baz5(): kotlin.Unit
 
 public interface A {
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt
index 3c9334838d3..da1020399d7 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt
@@ -25,7 +25,7 @@ fun @MyDsl A.baz5() {
     }
 }
 
-fun main(args: Array<String>) {
+fun main() {
     baz1 {
         baz2 {
             bar()
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.txt b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.txt
index f2b741aba2f..c9f9b02974d 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.txt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.txt
@@ -4,7 +4,7 @@ public fun baz1(/*0*/ x: (@MyDsl A).() -> kotlin.Unit): kotlin.Unit
 public fun baz2(/*0*/ x: (@MyDsl B).() -> kotlin.Unit): kotlin.Unit
 public fun baz3(/*0*/ x: @MyDsl() (A.() -> kotlin.Unit)): kotlin.Unit
 public fun baz4(/*0*/ x: @MyDsl() (B.() -> kotlin.Unit)): kotlin.Unit
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 public fun @MyDsl A.baz5(): kotlin.Unit
 
 public interface A {
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.kt b/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.kt
index a948ccb44a8..8da05d9e3ed 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.kt
@@ -18,7 +18,7 @@ val D.attr: B
     get() = B()
 
 
-fun main(args: Array<String>) {
+fun main() {
     val b =  D()
     b.attr {} // overload resolution ambiguity
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.txt
index 8ce9b878615..ea93bac8a8c 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.txt
@@ -3,7 +3,7 @@ package
 package bar {
     public val bar.C.attr: bar.A
     public val bar.D.attr: bar.B
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 
     public open class A {
         public constructor A()
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.kt b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.kt
index 658d5f35e63..8080c3fec3b 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.kt
@@ -19,7 +19,7 @@ enum class TestClasses : EnumStyleClass {
 }
 
 // example
-fun main(args: Array<String>) {
+fun main() {
     // Kotlin: Expression 'cls1' of type 'DOMElementTestClasses' cannot be invoked as a function
     DOMElementTestClasses.cls1()
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
index bcf9c1c1618..67298d254a0 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final enum class DOMElementTestClasses : kotlin.Enum<DOMElementTestClasses> {
     enum entry cls1
diff --git a/compiler/testData/diagnostics/tests/scopes/invisibleSetter.kt b/compiler/testData/diagnostics/tests/scopes/invisibleSetter.kt
index 80422f22720..09e2f95e1ea 100644
--- a/compiler/testData/diagnostics/tests/scopes/invisibleSetter.kt
+++ b/compiler/testData/diagnostics/tests/scopes/invisibleSetter.kt
@@ -3,7 +3,7 @@ class A<T> {
         private set
 }
 
-fun main(args: Array<String>) {
+fun main() {
     val a = A<Any>()
     <!INVISIBLE_SETTER!>a.x<!> = 1
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/scopes/invisibleSetter.txt b/compiler/testData/diagnostics/tests/scopes/invisibleSetter.txt
index aa9dc78a0ee..50555f76bb5 100644
--- a/compiler/testData/diagnostics/tests/scopes/invisibleSetter.txt
+++ b/compiler/testData/diagnostics/tests/scopes/invisibleSetter.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public final class A</*0*/ T> {
     public constructor A</*0*/ T>()
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.kt
index 194f39b479c..a0779561177 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.kt
@@ -1,7 +1,7 @@
 //KT-2851 Type inference failed passing in not-null after smart-cast value in Pair
 package a
 
-fun main(args: Array<String>) {
+fun main() {
     val value: String? = ""
     if (value != null) {
         foo(Pair("val", <!DEBUG_INFO_SMARTCAST!>value<!>))
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.txt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.txt
index 0a119c55b24..a6efdb31da6 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.txt
@@ -2,7 +2,7 @@ package
 
 package a {
     public fun foo(/*0*/ map: a.Pair<kotlin.String, kotlin.String>): kotlin.Unit
-    public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+    public fun main(): kotlin.Unit
 
     public final class Pair</*0*/ out A, /*1*/ out B> {
         public constructor Pair</*0*/ out A, /*1*/ out B>(/*0*/ first: A, /*1*/ second: B)
diff --git a/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.kt b/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.kt
index ba9432e1dab..c9d48b8adf0 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.kt
@@ -1,4 +1,4 @@
-fun main(args: Array<String>) {
+fun main() {
     var result: String? = null
     var i = 0
     while (result == null) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.txt b/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1835.kt b/compiler/testData/diagnostics/tests/varargs/kt1835.kt
index 05c178d3994..f55f90935aa 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1835.kt
+++ b/compiler/testData/diagnostics/tests/varargs/kt1835.kt
@@ -5,7 +5,7 @@ public class JavaClass {
 }
 
 // FILE: kotlin.kt
-fun main(args : Array<String>) {
+fun main() {
     JavaClass().from()
     JavaClass().from("")
     JavaClass().from("", "")
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1835.txt b/compiler/testData/diagnostics/tests/varargs/kt1835.txt
index 66eb16574fc..1ceef3dbbab 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1835.txt
+++ b/compiler/testData/diagnostics/tests/varargs/kt1835.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public open class JavaClass {
     public constructor JavaClass()
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.kt b/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.kt
index 645295ba0de..017dc2cf2c0 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.kt
@@ -3,7 +3,7 @@ val code = """
     + );
 """
 
-fun main(args: Array<String>): Unit {
+fun main(): Unit {
     js("var<!JSCODE_ERROR!> =<!> 10;")
 
     js("""var<!JSCODE_ERROR!> =<!> 10;""")
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.txt b/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.txt
index 56e985adeb9..01343444fc6 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.txt
@@ -4,4 +4,4 @@ public val code: kotlin.String = "
     var s = "hello"
     + );
 "
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.kt b/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.kt
index e3e13b239fa..10066d5e3db 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.kt
@@ -1,4 +1,4 @@
-fun main(args: Array<String>): Unit {
+fun main(): Unit {
     js("var a =<!JSCODE_WARNING!> 08<!>;")
 
     js("""var a =<!JSCODE_WARNING!>
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.txt b/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/CallToMainRedeclaredInMultiFile.kt b/compiler/testData/diagnostics/testsWithStdLib/CallToMainRedeclaredInMultiFile.kt
index 35289768bc3..697f33d54bc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/CallToMainRedeclaredInMultiFile.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/CallToMainRedeclaredInMultiFile.kt
@@ -1,8 +1,8 @@
 // FILE: a.kt
-fun main(args: Array<String>) {}
+fun main(<!UNUSED_PARAMETER!>args<!>: Array<String>) {}
 
 // FILE: b.kt
-fun main(args: Array<String>) {}
+fun main(<!UNUSED_PARAMETER!>args<!>: Array<String>) {}
 
 // FILE: c.kt
 fun foo() { <!OVERLOAD_RESOLUTION_AMBIGUITY!>main<!>(arrayOf("a", "b")) }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt b/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt
index c884b35734c..2c0f46d5d33 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt
@@ -2,10 +2,10 @@
 @file:JvmName("Util")
 @file:JvmMultifileClass
 
-<!CONFLICTING_JVM_DECLARATIONS!>fun main(args: Array<String>)<!> {}
+<!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>fun main()<!> {}
 
 // FILE: b.kt
 @file:JvmName("Util")
 @file:JvmMultifileClass
 
-<!CONFLICTING_JVM_DECLARATIONS!>fun main(args: Array<String>)<!> {}
\ No newline at end of file
+<!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>fun main()<!> {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.txt b/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.txt
index abafee5d3ef..0bff3544466 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.txt
@@ -1,4 +1,4 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt
index 6f1d592d7f3..65b17e8363d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: -JvmStaticInInterface
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-fun main(args: Array<String>) {
+fun main() {
     <!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic fun a()<!>{
 
     }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun_LL13.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun_LL13.kt
index 9254b901acb..5a368db1787 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun_LL13.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun_LL13.kt
@@ -1,6 +1,6 @@
 // !LANGUAGE: +JvmStaticInInterface
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-fun main(args: Array<String>) {
+fun main() {
     <!JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION!>@JvmStatic fun a()<!>{
 
     }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun_LL13.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun_LL13.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun_LL13.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/localFun_LL13.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.kt b/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.kt
index c06f22b3d8d..b00b584bd5e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.kt
@@ -12,6 +12,6 @@ interface Base {
     fun <V: Any> foo(compute: () -> V?)
 }
 
-fun main(args: Array<String>) {
+fun main() {
     Derived().foo<String> { "" }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.txt b/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.txt
index 23f2101a1c3..497e2d0e513 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public interface Base {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt
index 1d783be79c8..8ce97e5bad8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt
@@ -1,6 +1,6 @@
 //KT-4711 Error type with no error reported from type inference
 
-fun main(args:Array<String>) {
+fun main() {
     val n = 100
     val delta = 1.0 / n
     val startTimeNanos = System.nanoTime()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.txt b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.txt
index 49ba831837b..a9fef69810f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.txt
@@ -1,3 +1,3 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.kt b/compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.kt
index 305a8a6ff7d..4ab40699fd5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.kt
@@ -4,6 +4,6 @@ public class A {
 }
 
 // FILE: 1.kt
-fun main(args: Array<String>) {
+fun main() {
     A.main(arrayOf())
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.txt b/compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.txt
index af68c886926..819895d997f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.txt
@@ -1,6 +1,6 @@
 package
 
-public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
+public fun main(): kotlin.Unit
 
 public open class A {
     public constructor A()
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 957802e6d95..b223bcb8d4c 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -3608,6 +3608,16 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/localObjectInConstructor.kt");
             }
 
+            @TestMetadata("mainWith12.kt")
+            public void testMainWith12() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith12.kt");
+            }
+
+            @TestMetadata("mainWith13.kt")
+            public void testMainWith13() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith13.kt");
+            }
+
             @TestMetadata("nestedTryFinally.kt")
             public void testNestedTryFinally() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/nestedTryFinally.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
index 30e276bc949..51718b58b54 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
@@ -3608,6 +3608,16 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/localObjectInConstructor.kt");
             }
 
+            @TestMetadata("mainWith12.kt")
+            public void testMainWith12() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith12.kt");
+            }
+
+            @TestMetadata("mainWith13.kt")
+            public void testMainWith13() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/mainWith13.kt");
+            }
+
             @TestMetadata("nestedTryFinally.kt")
             public void testNestedTryFinally() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/nestedTryFinally.kt");