diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java
index b022a481a05..13f4cab3722 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java
@@ -39,6 +39,7 @@ public class StdLibTestToJSTest extends StdLibTestSupport {
 
         generateJavaScriptFiles(EcmaVersion.all(),
                                 "libraries/stdlib/test",
+                                "StringTest.kt",
                                 "js/SimpleTest.kt");
     }
 }
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
index 9dda8814647..17cf7292a16 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
@@ -40,7 +40,8 @@ public class StdLibToJSTest extends StdLibTestSupport {
         generateJavaScriptFiles(EcmaVersion.all(),
                                 "libraries/stdlib/src",
                                 "kotlin/Preconditions.kt",
-                                "kotlin/dom/Dom.kt",
+                                // TODO re-enable when we've got the filter stuff ported to JS
+                                //"kotlin/dom/Dom.kt",
                                 "kotlin/support/AbstractIterator.kt");
     }
 }
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
index 1d452b4dc91..290d05cf416 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
@@ -78,7 +78,9 @@ public abstract class Config {
      */
     @NotNull
     public static final List<String> LIB_FILE_NAMES_DEPENDENT_ON_STDLIB = Arrays.asList(
-            "/stdlib/test.kt"
+            "/stdlib/test.kt",
+            "/core/stringDefs.kt",
+            "/core/strings.kt"
     );
 
     public static final String LIBRARIES_LOCATION = "js/js.libraries/src";
@@ -88,6 +90,8 @@ public abstract class Config {
      */
     @NotNull
     public static final List<String> STDLIB_FILE_NAMES = Arrays.asList(
+            "/kotlin/Preconditions.kt",
+            "/kotlin/Strings.kt",
             "/kotlin/test/Test.kt"
     );
 
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java
index 5d2d64ca78c..f784f264771 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java
@@ -220,7 +220,6 @@ public final class Translation {
             @NotNull JsBlock block,
             List<String> rawStatements) {
         ClassDescriptor lastClassDescriptor = null;
-        boolean declaredVar = false;
         List<JetNamedFunction> functions = JetTestFunctionDetector.findTestFunctions(context.bindingContext(), files);
         for (JetNamedFunction function : functions) {
             FunctionDescriptor functionDescriptor = getFunctionDescriptor(context.bindingContext(), function);
@@ -229,16 +228,9 @@ public final class Translation {
             if (containingDeclaration instanceof ClassDescriptor) {
                 ClassDescriptor classDescriptor = (ClassDescriptor) containingDeclaration;
                 String className = getQualifiedName(classDescriptor);
-                if (lastClassDescriptor != classDescriptor) {
-                    lastClassDescriptor = classDescriptor;
-                    String prefix = "";
-                    if (!declaredVar) {
-                        prefix = "var ";
-                        declaredVar = true;
-                    }
-                    rawStatements.add(prefix + "_testCase = new Kotlin.defs." + className + "();");
-                }
                 rawStatements.add("QUnit.test( \"" + className + "." + funName + "()\" , function() {");
+                String prefix = "    var ";
+                rawStatements.add(prefix + "_testCase = new Kotlin.defs." + className + "();");
                 //rawStatements.add("    expect(0);");
                 rawStatements.add("    _testCase." + funName + "();");
             } else {
diff --git a/libraries/tools/kotlin-js-tests/pom.xml b/libraries/tools/kotlin-js-tests/pom.xml
index 035334a8298..0e360447400 100644
--- a/libraries/tools/kotlin-js-tests/pom.xml
+++ b/libraries/tools/kotlin-js-tests/pom.xml
@@ -39,12 +39,10 @@
                             <target>
                                 <mkdir dir="${basedir}/target/tests"/>
                                 <copy todir="${basedir}/target/tests">
-<!--
                                     <fileset dir="${basedir}/../../stdlib/test/js">
                                         <include name="**/*.kt"/>
                                         <exclude name="**/*JVM.kt"/>
                                     </fileset>
--->
 <!--
                                     <fileset dir="${basedir}/../../stdlib/test/dom">
                                         <include name="**/*.kt"/>