diff --git a/compiler/testData/cli/js/createMetadata.args b/compiler/testData/cli/js/createMetadata.args
index 8ea42e28941..71063533218 100644
--- a/compiler/testData/cli/js/createMetadata.args
+++ b/compiler/testData/cli/js/createMetadata.args
@@ -1,5 +1,4 @@
 compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/jslib-example/LibraryExample.kt
--no-stdlib
 -meta-info
 -output
 $TEMP_DIR$/jslib-example.js
diff --git a/compiler/testData/cli/js/notValidLibraryDir.args b/compiler/testData/cli/js/notValidLibraryDir.args
index f98249d929f..d36591715d4 100644
--- a/compiler/testData/cli/js/notValidLibraryDir.args
+++ b/compiler/testData/cli/js/notValidLibraryDir.args
@@ -1,5 +1,5 @@
 $TESTDATA_DIR$/withLib.kt
 -libraries
-compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib
+compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib
 -output
 $TEMP_DIR$/out.js
diff --git a/compiler/testData/cli/js/notValidLibraryDir.out b/compiler/testData/cli/js/notValidLibraryDir.out
index 66f4bd3305c..82ff68be02e 100644
--- a/compiler/testData/cli/js/notValidLibraryDir.out
+++ b/compiler/testData/cli/js/notValidLibraryDir.out
@@ -1,8 +1,8 @@
-warning: 'compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib' is not a valid Kotlin Javascript library
+warning: 'compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib' is not a valid Kotlin Javascript library
 compiler/testData/cli/js/withLib.kt:2:8: error: unresolved reference: library
 import library.sample.*
        ^
 compiler/testData/cli/js/withLib.kt:6:13: error: unresolved reference: pairAdd
     val x = pairAdd(p)
             ^
-COMPILATION_ERROR
\ No newline at end of file
+COMPILATION_ERROR
diff --git a/compiler/testData/cli/js/outputIsDirectory.args b/compiler/testData/cli/js/outputIsDirectory.args
index 89a19b44b1d..c2150b4c9a0 100644
--- a/compiler/testData/cli/js/outputIsDirectory.args
+++ b/compiler/testData/cli/js/outputIsDirectory.args
@@ -1,4 +1,3 @@
 $TESTDATA_DIR$/simple2js.kt
--no-stdlib
 -output
 $TESTDATA_DIR$
diff --git a/compiler/testData/cli/js/outputPostfixFileNotFound.args b/compiler/testData/cli/js/outputPostfixFileNotFound.args
index 0da693dc816..cab465cb577 100644
--- a/compiler/testData/cli/js/outputPostfixFileNotFound.args
+++ b/compiler/testData/cli/js/outputPostfixFileNotFound.args
@@ -1,5 +1,4 @@
 $TESTDATA_DIR$/simple2js.kt
--no-stdlib
 -output
 $TEMP_DIR$/out.js
 -output-postfix
diff --git a/compiler/testData/cli/js/outputPrefixFileNotFound.args b/compiler/testData/cli/js/outputPrefixFileNotFound.args
index 3042c1c5b18..4e7e0c86d01 100644
--- a/compiler/testData/cli/js/outputPrefixFileNotFound.args
+++ b/compiler/testData/cli/js/outputPrefixFileNotFound.args
@@ -1,5 +1,4 @@
 $TESTDATA_DIR$/simple2js.kt
--no-stdlib
 -output
 $TEMP_DIR$/out.js
 -output-prefix
diff --git a/compiler/testData/cli/js/simple2js.args b/compiler/testData/cli/js/simple2js.args
index 0d7e52c32b5..d99fe90b79c 100644
--- a/compiler/testData/cli/js/simple2js.args
+++ b/compiler/testData/cli/js/simple2js.args
@@ -1,4 +1,3 @@
 $TESTDATA_DIR$/simple2js.kt
--no-stdlib
 -output
 $TEMP_DIR$/out.js
diff --git a/compiler/testData/cli/js/sourceMap.args b/compiler/testData/cli/js/sourceMap.args
index ec0bfee4154..2d1cd497e61 100644
--- a/compiler/testData/cli/js/sourceMap.args
+++ b/compiler/testData/cli/js/sourceMap.args
@@ -1,5 +1,4 @@
 $TESTDATA_DIR$/sourceMap.kt
--no-stdlib
 -source-map
 -source-map-prefix
 ./
diff --git a/compiler/testData/cli/js/sourceMapCharEscape.args b/compiler/testData/cli/js/sourceMapCharEscape.args
index 171ae477352..6e1e1e5f82f 100644
--- a/compiler/testData/cli/js/sourceMapCharEscape.args
+++ b/compiler/testData/cli/js/sourceMapCharEscape.args
@@ -1,5 +1,4 @@
 $TESTDATA_DIR$/sourceMapCharEscape.kt
--no-stdlib
 -source-map
 -source-map-embed-sources
 always
diff --git a/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.args b/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.args
index 77f63052fe4..6135a9c029f 100644
--- a/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.args
+++ b/compiler/testData/cli/js/sourceMapDuplicateRelativePaths.args
@@ -1,5 +1,4 @@
 $TESTDATA_DIR$/sourceMapDuplicatePath/
--no-stdlib
 -source-map
 -source-map-base-dirs
 $TESTDATA_DIR$/sourceMapDuplicatePath/foo:$TESTDATA_DIR$/sourceMapDuplicatePath/bar
diff --git a/compiler/testData/cli/js/sourceMapEmbedSources.args b/compiler/testData/cli/js/sourceMapEmbedSources.args
index fd3c5812464..2bbca3cc65e 100644
--- a/compiler/testData/cli/js/sourceMapEmbedSources.args
+++ b/compiler/testData/cli/js/sourceMapEmbedSources.args
@@ -1,5 +1,4 @@
 $TESTDATA_DIR$/sourceMap.kt
--no-stdlib
 -source-map
 -source-map-prefix
 ./
diff --git a/compiler/testData/cli/js/sourceMapPrefix.args b/compiler/testData/cli/js/sourceMapPrefix.args
index ee402223e44..ca913c3256c 100644
--- a/compiler/testData/cli/js/sourceMapPrefix.args
+++ b/compiler/testData/cli/js/sourceMapPrefix.args
@@ -1,5 +1,4 @@
 $TESTDATA_DIR$/sourceMap.kt
--no-stdlib
 -source-map
 -source-map-prefix
 /localhost/src/
diff --git a/compiler/testData/cli/js/sourceMapRelativeRoot.args b/compiler/testData/cli/js/sourceMapRelativeRoot.args
index 5c6cbb9f720..1ecfdbdd75a 100644
--- a/compiler/testData/cli/js/sourceMapRelativeRoot.args
+++ b/compiler/testData/cli/js/sourceMapRelativeRoot.args
@@ -1,14 +1,12 @@
 $TESTDATA_DIR$/sourceMapRelativeRoot/lib/src/lib.kt
--no-stdlib
 -source-map
 -meta-info
 -output
 $TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/lib.js
 ---
 $TESTDATA_DIR$/sourceMapRelativeRoot/main/src/main.kt
--no-stdlib
 -libraries
 $TESTDATA_DIR$/sourceMapRelativeRoot/lib/out/
 -source-map
 -output
-$TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js
\ No newline at end of file
+$TESTDATA_DIR$/sourceMapRelativeRoot/main/out/main.js
diff --git a/compiler/testData/cli/js/sourceMapRootAuto.args b/compiler/testData/cli/js/sourceMapRootAuto.args
index 75c8893ced4..26b6be07bf1 100644
--- a/compiler/testData/cli/js/sourceMapRootAuto.args
+++ b/compiler/testData/cli/js/sourceMapRootAuto.args
@@ -1,6 +1,5 @@
 $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
--no-stdlib
 -source-map
 -source-map-prefix
 ./
diff --git a/compiler/testData/cli/js/sourceMapRootManual.args b/compiler/testData/cli/js/sourceMapRootManual.args
index e280b72da6f..49a3e3a4b40 100644
--- a/compiler/testData/cli/js/sourceMapRootManual.args
+++ b/compiler/testData/cli/js/sourceMapRootManual.args
@@ -1,6 +1,5 @@
 $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
--no-stdlib
 -source-map
 -source-map-base-dirs
 $TESTDATA_DIR$/
diff --git a/compiler/testData/cli/js/sourceMapRootMissing.args b/compiler/testData/cli/js/sourceMapRootMissing.args
index b7142ce5ce6..8240660ce3f 100644
--- a/compiler/testData/cli/js/sourceMapRootMissing.args
+++ b/compiler/testData/cli/js/sourceMapRootMissing.args
@@ -2,7 +2,6 @@ $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/baz/file3.kt
 $TESTDATA_DIR$/sourceMapRoot/foo/baz/file4.kt
--no-stdlib
 -source-map
 -source-map-base-dirs
 $TESTDATA_DIR$/sourceMapRoot/foo
diff --git a/compiler/testData/cli/js/sourceMapRootMultiple.args b/compiler/testData/cli/js/sourceMapRootMultiple.args
index 6e122e374a2..16e948064c1 100644
--- a/compiler/testData/cli/js/sourceMapRootMultiple.args
+++ b/compiler/testData/cli/js/sourceMapRootMultiple.args
@@ -1,6 +1,5 @@
 $TESTDATA_DIR$/sourceMapRoot/foo/file1.kt
 $TESTDATA_DIR$/sourceMapRoot/bar/file2.kt
--no-stdlib
 -source-map
 -source-map-base-dirs
 $TESTDATA_DIR$/foo:$TESTDATA_DIR$/bar
diff --git a/compiler/testData/cli/js/suppressAllWarningsJS.args b/compiler/testData/cli/js/suppressAllWarningsJS.args
index ccf1d4754d3..b8ca87aa49f 100644
--- a/compiler/testData/cli/js/suppressAllWarningsJS.args
+++ b/compiler/testData/cli/js/suppressAllWarningsJS.args
@@ -1,5 +1,4 @@
 $TESTDATA_DIR$/../warnings.kt
--no-stdlib
 -nowarn
 -output
 $TEMP_DIR$/out.js
diff --git a/compiler/testData/integration/ant/js/additionalArguments/build.xml b/compiler/testData/integration/ant/js/additionalArguments/build.xml
index d7f2d56a067..a1d9a6c52e8 100644
--- a/compiler/testData/integration/ant/js/additionalArguments/build.xml
+++ b/compiler/testData/integration/ant/js/additionalArguments/build.xml
@@ -2,7 +2,7 @@
     <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
-        <kotlin2js src="${test.data}/hello.kt" noStdlib="true" output="${temp}/out.js">
+        <kotlin2js src="${test.data}/hello.kt" output="${temp}/out.js">
             <compilerarg value="-Xno-inline"/>
         </kotlin2js>
     </target>
diff --git a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
index 099ace2d290..c5bfb5d4a65 100644
--- a/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
+++ b/compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
@@ -3,7 +3,6 @@
 
   <target name="build">
     <kotlin2js src="${test.data}/root1"
-               noStdlib="true"
                output="${temp}/out.js"
                outputPrefix="${test.data}/prefix"
                outputPostfix="${test.data}/postfix" />
diff --git a/compiler/testData/integration/ant/js/manySources/build.xml b/compiler/testData/integration/ant/js/manySources/build.xml
index b7c38ad9744..ca735fae0f3 100644
--- a/compiler/testData/integration/ant/js/manySources/build.xml
+++ b/compiler/testData/integration/ant/js/manySources/build.xml
@@ -2,7 +2,7 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" >
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" >
        <src>
          <pathelement path="${test.data}/bar.kt"/>
          <fileset dir="${test.data}/root2">
diff --git a/compiler/testData/integration/ant/js/outputPostfix/build.xml b/compiler/testData/integration/ant/js/outputPostfix/build.xml
index 40666ba00b2..49c9baddd9c 100644
--- a/compiler/testData/integration/ant/js/outputPostfix/build.xml
+++ b/compiler/testData/integration/ant/js/outputPostfix/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"  outputPostfix="${test.data}/postfix" />
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPostfix="${test.data}/postfix" />
   </target>
 </project>
diff --git a/compiler/testData/integration/ant/js/outputPrefix/build.xml b/compiler/testData/integration/ant/js/outputPrefix/build.xml
index 0d7736a4e80..467465ed93e 100644
--- a/compiler/testData/integration/ant/js/outputPrefix/build.xml
+++ b/compiler/testData/integration/ant/js/outputPrefix/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" outputPrefix="${test.data}/prefix" />
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" outputPrefix="${test.data}/prefix" />
   </target>
 </project>
diff --git a/compiler/testData/integration/ant/js/simple/build.xml b/compiler/testData/integration/ant/js/simple/build.xml
index 3b3e641684b..9b68b598242 100644
--- a/compiler/testData/integration/ant/js/simple/build.xml
+++ b/compiler/testData/integration/ant/js/simple/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
   </target>
 </project>
diff --git a/compiler/testData/integration/ant/js/simple/root1/foo.kt b/compiler/testData/integration/ant/js/simple/root1/foo.kt
index f6123b9882f..7f2587a693c 100644
--- a/compiler/testData/integration/ant/js/simple/root1/foo.kt
+++ b/compiler/testData/integration/ant/js/simple/root1/foo.kt
@@ -1,3 +1,12 @@
 package foo
 
-fun box(): String = "OK"
+var ok = "FAIL"
+
+val hello = Pair("Hello", "World")
+
+fun main() {
+    ok = "OK"
+    println(hello.first + " " + hello.second)
+}
+
+fun box(): String = ok
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib/build.log.expected b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/build.log.expected
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/build.log.expected
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib/build.xml b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/build.xml
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib/build.xml
rename to compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/build.xml
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib/jslib-example/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/jslib-example/LibraryExample.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib/jslib-example/LibraryExample.kt
rename to compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/jslib-example/LibraryExample.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/root1/foo.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLib/root1/foo.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/amd.js
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js
rename to compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/amd.js
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.log.expected b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.log.expected
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.log.expected
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.xml b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.xml
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.xml
rename to compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/build.xml
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt
rename to compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/jslib-example/LibraryExample.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/root1/foo.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithJsFileAsAnotherLibModuleKind/root1/foo.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/build.log.expected b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.log.expected
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.log.expected
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/build.xml b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.xml
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/build.xml
rename to compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/build.xml
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/jslib-example1/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example1/LibraryExample.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/jslib-example1/LibraryExample.kt
rename to compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example1/LibraryExample.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/jslib-example2/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example2/LibraryExample.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/jslib-example2/LibraryExample.kt
rename to compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/jslib-example2/LibraryExample.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/root1/foo.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithJsFilesWithTwoModulesAsLibrary/root1/foo.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithMain/build.xml b/compiler/testData/integration/ant/js/simpleWithMain/build.xml
index e6152353a71..9b68b598242 100644
--- a/compiler/testData/integration/ant/js/simpleWithMain/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithMain/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" main="call"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
   </target>
 </project>
diff --git a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
index 609c55d4983..9b68b598242 100644
--- a/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
   </target>
 </project>
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlib/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithStdlib/root1/foo.kt
deleted file mode 100644
index 7f2587a693c..00000000000
--- a/compiler/testData/integration/ant/js/simpleWithStdlib/root1/foo.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package foo
-
-var ok = "FAIL"
-
-val hello = Pair("Hello", "World")
-
-fun main() {
-    ok = "OK"
-    println(hello.first + " " + hello.second)
-}
-
-fun box(): String = ok
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/build.log.expected b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.log.expected
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.log.expected
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/build.xml b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.xml
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/build.xml
rename to compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/build.xml
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/jslib-example1/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example1/LibraryExample.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/jslib-example1/LibraryExample.kt
rename to compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example1/LibraryExample.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/jslib-example2/LibraryExample.kt b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example2/LibraryExample.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/jslib-example2/LibraryExample.kt
rename to compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/jslib-example2/LibraryExample.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/root1/foo.kt
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/root1/foo.kt
rename to compiler/testData/integration/ant/js/simpleWithTwoJsFilesAsLibraries/root1/foo.kt
diff --git a/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml b/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
index 609c55d4983..9b68b598242 100644
--- a/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
   </target>
 </project>
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlib/build.log.expected b/compiler/testData/integration/ant/js/simpleWithoutStdlib/build.log.expected
similarity index 100%
rename from compiler/testData/integration/ant/js/simpleWithStdlib/build.log.expected
rename to compiler/testData/integration/ant/js/simpleWithoutStdlib/build.log.expected
diff --git a/compiler/testData/integration/ant/js/simpleWithStdlib/build.xml b/compiler/testData/integration/ant/js/simpleWithoutStdlib/build.xml
similarity index 70%
rename from compiler/testData/integration/ant/js/simpleWithStdlib/build.xml
rename to compiler/testData/integration/ant/js/simpleWithoutStdlib/build.xml
index 9b68b598242..3b3e641684b 100644
--- a/compiler/testData/integration/ant/js/simpleWithStdlib/build.xml
+++ b/compiler/testData/integration/ant/js/simpleWithoutStdlib/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
+    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"/>
   </target>
 </project>
diff --git a/compiler/testData/integration/ant/js/simpleWithoutStdlib/root1/foo.kt b/compiler/testData/integration/ant/js/simpleWithoutStdlib/root1/foo.kt
new file mode 100644
index 00000000000..f6123b9882f
--- /dev/null
+++ b/compiler/testData/integration/ant/js/simpleWithoutStdlib/root1/foo.kt
@@ -0,0 +1,3 @@
+package foo
+
+fun box(): String = "OK"
diff --git a/compiler/testData/integration/ant/js/sourceMap/build.xml b/compiler/testData/integration/ant/js/sourceMap/build.xml
index b2832f17917..db65f7629fc 100644
--- a/compiler/testData/integration/ant/js/sourceMap/build.xml
+++ b/compiler/testData/integration/ant/js/sourceMap/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" sourcemap="true"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" sourcemap="true"/>
   </target>
 </project>
diff --git a/compiler/testData/integration/ant/js/verbose/build.xml b/compiler/testData/integration/ant/js/verbose/build.xml
index 23929c33fcb..923ad4e360e 100644
--- a/compiler/testData/integration/ant/js/verbose/build.xml
+++ b/compiler/testData/integration/ant/js/verbose/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" verbose="true"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" verbose="true"/>
   </target>
 </project>
diff --git a/compiler/testData/integration/ant/js/version/build.xml b/compiler/testData/integration/ant/js/version/build.xml
index 179131791ae..5b2c05bedc5 100644
--- a/compiler/testData/integration/ant/js/version/build.xml
+++ b/compiler/testData/integration/ant/js/version/build.xml
@@ -2,6 +2,6 @@
   <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <target name="build">
-    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" printVersion="true"/>
+    <kotlin2js src="${test.data}/root1" output="${temp}/out.js" printVersion="true"/>
   </target>
 </project>
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
index e9d6cf1267a..996c04ca98e 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt
@@ -83,7 +83,6 @@ class LauncherScriptTest : TestCaseWithTmpdir() {
         runProcess(
                 "kotlinc-js",
                 "$testDataDirectory/emptyMain.kt",
-                "-no-stdlib",
                 "-output", File(tmpdir, "out.js").path
         )
     }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java b/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java
index 3b56e215df7..83a5fd7ef9a 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java
@@ -95,7 +95,7 @@ public class AntTaskJsTest extends AbstractAntTaskTest {
         doJsAntTest();
     }
 
-    public void testSimpleWithStdlib() throws Exception {
+    public void testSimpleWithoutStdlib() throws Exception {
         doJsAntTest();
     }
 
@@ -107,19 +107,19 @@ public class AntTaskJsTest extends AbstractAntTaskTest {
         doJsAntTest("jslib-example.js");
     }
 
-    public void testSimpleWithStdlibAndJsFileAsAnotherLib() throws Exception {
+    public void testSimpleWithJsFileAsAnotherLib() throws Exception {
         doJsAntTest("jslib-example.js");
     }
 
-    public void testSimpleWithStdlibAndJsFileAsAnotherLibModuleKind() throws Exception {
+    public void testSimpleWithJsFileAsAnotherLibModuleKind() throws Exception {
         doJsAntTest(true, "amd.js", "jslib-example.js");
     }
 
-    public void testSimpleWithStdlibAndTwoJsFilesAsLibraries() throws Exception {
+    public void testSimpleWithTwoJsFilesAsLibraries() throws Exception {
         doJsAntTest("jslib-example1.js", "jslib-example2.js");
     }
 
-    public void testSimpleWithStdlibAndJsFilesWithTwoModulesAsLibrary() throws Exception {
+    public void testSimpleWithJsFilesWithTwoModulesAsLibrary() throws Exception {
         doJsAntTest("jslib-example.js");
     }