diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java
index 3d42778515d..a2e07c93a2a 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java
@@ -74,8 +74,8 @@ public final class PatternMatchingTest extends SingleFileTranslationTest {
         }
     }
 
-    public void testKT1665() throws Exception {
-        checkOutput("kt1665.kt", "a", "");
+    public void testKt1665() throws Exception {
+        checkFooBoxIsOk();
     }
 
     public void testWhenWithoutExpression() throws Exception {
diff --git a/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt b/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt
index fdcfcec0797..c77cc52ba7b 100644
--- a/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt
+++ b/js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt
@@ -12,7 +12,3 @@ class A() {
 fun box(): Boolean {
     return A().p()
 }
-
-fun main(arg: Array<String>) {
-    println(box())
-}
\ No newline at end of file
diff --git a/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt b/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt
index 16942d23712..ac416808bf6 100644
--- a/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt
+++ b/js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt
@@ -12,7 +12,3 @@ class A() {
 fun box(): Boolean {
     return A().p()
 }
-
-fun main(arg: Array<String>) {
-    println(box())
-}
\ No newline at end of file
diff --git a/js/js.translator/testFiles/expression/misc/cases/intRange.kt b/js/js.translator/testFiles/expression/misc/cases/intRange.kt
index 73d578db692..eb8e627da85 100644
--- a/js/js.translator/testFiles/expression/misc/cases/intRange.kt
+++ b/js/js.translator/testFiles/expression/misc/cases/intRange.kt
@@ -106,7 +106,3 @@ fun testReversedRange() : Boolean {
 
     return true;
 }
-
-fun main(args : Array<String>) {
-    println(box())
-}
\ No newline at end of file
diff --git a/js/js.translator/testFiles/patternMatching/cases/kt1665.kt b/js/js.translator/testFiles/patternMatching/cases/kt1665.kt
index 1d0721b5179..e7a782d1a09 100644
--- a/js/js.translator/testFiles/patternMatching/cases/kt1665.kt
+++ b/js/js.translator/testFiles/patternMatching/cases/kt1665.kt
@@ -1,9 +1,11 @@
-fun main(args : Array<String>) {
+package foo
+
+fun box(): String {
   val a = 10
   val b = 3
   when {
-    a > b -> println("a")
-    b > a  -> println("b")
-    else -> println("Unknown")
+    a > b -> return "OK"
+    b > a  -> return "b"
+    else -> return "else"
   }
 }
\ No newline at end of file
diff --git a/js/js.translator/testFiles/range/cases/intInRange.kt b/js/js.translator/testFiles/range/cases/intInRange.kt
index 95959d09eb2..d5eeb48618d 100644
--- a/js/js.translator/testFiles/range/cases/intInRange.kt
+++ b/js/js.translator/testFiles/range/cases/intInRange.kt
@@ -13,7 +13,3 @@ fun box() : Boolean {
 
     return true;
 }
-
-fun main() {
-    box()
-}
\ No newline at end of file
diff --git a/js/js.translator/testFiles/range/cases/iteratingOverRanges.kt b/js/js.translator/testFiles/range/cases/iteratingOverRanges.kt
index a0a4ccc95ad..c66bd5f319a 100644
--- a/js/js.translator/testFiles/range/cases/iteratingOverRanges.kt
+++ b/js/js.translator/testFiles/range/cases/iteratingOverRanges.kt
@@ -35,7 +35,3 @@ fun box() : Boolean {
     return true
 
 }
-
-fun main() {
-    box()
-}
\ No newline at end of file