diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3b81bbcf7fc..45568b73ce0 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -14,6 +14,7 @@
       <module fileurl="file://$PROJECT_DIR$/jslib/jslib.iml" filepath="$PROJECT_DIR$/jslib/jslib.iml" />
       <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/stdlib/stdlib.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/stdlib/stdlib.iml" />
       <module fileurl="file://$PROJECT_DIR$/translator/translator.iml" filepath="$PROJECT_DIR$/translator/translator.iml" />
+      <module fileurl="file://$PROJECT_DIR$/translatorTests/translatorTests.iml" filepath="$PROJECT_DIR$/translatorTests/translatorTests.iml" />
       <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/util/util.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/util/util.iml" />
     </modules>
   </component>
diff --git a/translator/translator.iml b/translator/translator.iml
index a9835139ad8..b8eb03f35d2 100644
--- a/translator/translator.iml
+++ b/translator/translator.iml
@@ -4,7 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../translatorTests/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/examples" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/translator/test/org/jetbrains/k2js/test/AbstractExpressionTest.java b/translatorTests/test/org/jetbrains/k2js/test/AbstractExpressionTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/AbstractExpressionTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/AbstractExpressionTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/AppletTest.java b/translatorTests/test/org/jetbrains/k2js/test/AppletTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/AppletTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/AppletTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/ArrayListTest.java b/translatorTests/test/org/jetbrains/k2js/test/ArrayListTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/ArrayListTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/ArrayListTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/BaseTest.java b/translatorTests/test/org/jetbrains/k2js/test/BaseTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/BaseTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/BaseTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/BasicClassTest.java b/translatorTests/test/org/jetbrains/k2js/test/BasicClassTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/BasicClassTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/BasicClassTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/ClassInheritanceTest.java b/translatorTests/test/org/jetbrains/k2js/test/ClassInheritanceTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/ClassInheritanceTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/ClassInheritanceTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/ConditionalTest.java b/translatorTests/test/org/jetbrains/k2js/test/ConditionalTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/ConditionalTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/ConditionalTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/ExampleTestSuite.java b/translatorTests/test/org/jetbrains/k2js/test/ExampleTestSuite.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/ExampleTestSuite.java
rename to translatorTests/test/org/jetbrains/k2js/test/ExampleTestSuite.java
diff --git a/translator/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java b/translatorTests/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/ExtensionFunctionTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/ExtensionPropertyTest.java b/translatorTests/test/org/jetbrains/k2js/test/ExtensionPropertyTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/ExtensionPropertyTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/ExtensionPropertyTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/ForTest.java b/translatorTests/test/org/jetbrains/k2js/test/ForTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/ForTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/ForTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/FunctionTest.java b/translatorTests/test/org/jetbrains/k2js/test/FunctionTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/FunctionTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/FunctionTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/JavaClassesTest.java b/translatorTests/test/org/jetbrains/k2js/test/JavaClassesTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/JavaClassesTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/JavaClassesTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java b/translatorTests/test/org/jetbrains/k2js/test/KotlinLibTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/KotlinLibTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/KotlinLibTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/MiscTest.java b/translatorTests/test/org/jetbrains/k2js/test/MiscTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/MiscTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/MiscTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/MultiFileTest.java b/translatorTests/test/org/jetbrains/k2js/test/MultiFileTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/MultiFileTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/MultiFileTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/NameClashesTest.java b/translatorTests/test/org/jetbrains/k2js/test/NameClashesTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/NameClashesTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/NameClashesTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/ObjectTest.java b/translatorTests/test/org/jetbrains/k2js/test/ObjectTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/ObjectTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/ObjectTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java b/translatorTests/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/OperatorOverloadingTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java b/translatorTests/test/org/jetbrains/k2js/test/PatternMatchingTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/PatternMatchingTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/PropertyAccessTest.java b/translatorTests/test/org/jetbrains/k2js/test/PropertyAccessTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/PropertyAccessTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/PropertyAccessTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/RTTITest.java b/translatorTests/test/org/jetbrains/k2js/test/RTTITest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/RTTITest.java
rename to translatorTests/test/org/jetbrains/k2js/test/RTTITest.java
diff --git a/translator/test/org/jetbrains/k2js/test/RangeTest.java b/translatorTests/test/org/jetbrains/k2js/test/RangeTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/RangeTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/RangeTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/RhinoFunctionResultChecker.java b/translatorTests/test/org/jetbrains/k2js/test/RhinoFunctionResultChecker.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/RhinoFunctionResultChecker.java
rename to translatorTests/test/org/jetbrains/k2js/test/RhinoFunctionResultChecker.java
diff --git a/translator/test/org/jetbrains/k2js/test/RhinoPropertyTypesChecker.java b/translatorTests/test/org/jetbrains/k2js/test/RhinoPropertyTypesChecker.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/RhinoPropertyTypesChecker.java
rename to translatorTests/test/org/jetbrains/k2js/test/RhinoPropertyTypesChecker.java
diff --git a/translator/test/org/jetbrains/k2js/test/RhinoResultChecker.java b/translatorTests/test/org/jetbrains/k2js/test/RhinoResultChecker.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/RhinoResultChecker.java
rename to translatorTests/test/org/jetbrains/k2js/test/RhinoResultChecker.java
diff --git a/translator/test/org/jetbrains/k2js/test/RhinoSystemOutputChecker.java b/translatorTests/test/org/jetbrains/k2js/test/RhinoSystemOutputChecker.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/RhinoSystemOutputChecker.java
rename to translatorTests/test/org/jetbrains/k2js/test/RhinoSystemOutputChecker.java
diff --git a/translator/test/org/jetbrains/k2js/test/RhinoUtils.java b/translatorTests/test/org/jetbrains/k2js/test/RhinoUtils.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/RhinoUtils.java
rename to translatorTests/test/org/jetbrains/k2js/test/RhinoUtils.java
diff --git a/translator/test/org/jetbrains/k2js/test/SimpleTestSuite.java b/translatorTests/test/org/jetbrains/k2js/test/SimpleTestSuite.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/SimpleTestSuite.java
rename to translatorTests/test/org/jetbrains/k2js/test/SimpleTestSuite.java
diff --git a/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java b/translatorTests/test/org/jetbrains/k2js/test/StandardClassesTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/StandardClassesTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/StandardClassesTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/StringTest.java b/translatorTests/test/org/jetbrains/k2js/test/StringTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/StringTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/StringTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/Suite.java b/translatorTests/test/org/jetbrains/k2js/test/Suite.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/Suite.java
rename to translatorTests/test/org/jetbrains/k2js/test/Suite.java
diff --git a/translator/test/org/jetbrains/k2js/test/TraitTest.java b/translatorTests/test/org/jetbrains/k2js/test/TraitTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/TraitTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/TraitTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/TranslationTest.java b/translatorTests/test/org/jetbrains/k2js/test/TranslationTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/TranslationTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/TranslationTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java b/translatorTests/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java
rename to translatorTests/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java
diff --git a/translator/test/org/jetbrains/k2js/test/TupleTest.java b/translatorTests/test/org/jetbrains/k2js/test/TupleTest.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/TupleTest.java
rename to translatorTests/test/org/jetbrains/k2js/test/TupleTest.java
diff --git a/translator/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java b/translatorTests/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java
rename to translatorTests/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java
diff --git a/translator/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java b/translatorTests/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java
similarity index 100%
rename from translator/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java
rename to translatorTests/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java
diff --git a/translatorTests/translatorTests.iml b/translatorTests/translatorTests.iml
new file mode 100644
index 00000000000..ed4ac8d37f0
--- /dev/null
+++ b/translatorTests/translatorTests.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="translator" />
+    <orderEntry type="library" name="idea-full" level="application" />
+    <orderEntry type="library" name="js" level="application" />
+    <orderEntry type="module" module-name="compiler-tests" />
+    <orderEntry type="module" module-name="cli" />
+  </component>
+</module>
+