diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle
index 07301dce817..2ddaff96407 100644
--- a/libraries/stdlib/js/build.gradle
+++ b/libraries/stdlib/js/build.gradle
@@ -3,8 +3,11 @@ description = 'Kotlin Standard Library for JS'
 apply plugin: 'kotlin2js'
 
 ext.commonSrcDir = "${buildDir}/common-sources"
+ext.commonTestSrcDir = "${buildDir}/common-test-sources"
 ext.builtinsDir = "${rootDir}/../core/builtins"
-ext.jsSrcDir = "${rootDir}/../js/js.libraries/src"
+ext.jsLibrariesDir = "${rootDir}/../js/js.libraries"
+ext.jsSrcDir = "${jsLibrariesDir}/src"
+ext.jsTestSrcDir = "${jsLibrariesDir}/test"
 ext.jsSrcJsDir = "${jsSrcDir}/js"
 ext.jsOutputFile = "${buildDir}/classes/kotlin.js"
 
@@ -58,9 +61,21 @@ sourceSets {
             srcDir commonSrcDir
         }
     }
+
+    test {
+        kotlin {
+            srcDir commonTestSrcDir
+            srcDir jsTestSrcDir
+        }
+    }
+}
+
+dependencies {
+    testCompile project(':kotlin-test:kotlin-test-js')
 }
 
 createPreprocessorTask(project, "Main", "${projectDir}/../src/kotlin", commonSrcDir)
+createPreprocessorTask(project, "Test", "${projectDir}/../test", commonTestSrcDir)
 
 kotlin.experimental.coroutines "enable"
 
@@ -89,6 +104,13 @@ compileKotlin2Js {
     }
 }
 
+compileTestKotlin2Js {
+    dependsOn preprocessSourcesTest
+    kotlinOptions {
+        moduleKind = "plain"
+    }
+}
+
 configurations {
     closureCompiler
 }