diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
index 29e1429ee3b..6e8f3d3cfb5 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
@@ -82,7 +82,7 @@ public class TestlibTest extends CodegenTestCase {
             myEnvironment.addToClasspath(junitJar);
 
             CoreLocalFileSystem localFileSystem = myEnvironment.getLocalFileSystem();
-            session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../libraries/testlib/test"));
+            session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../libraries/stdlib/test"));
             session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../libraries/kunit/src"));
 
             if (!session.analyze(System.err, MessageRenderer.PLAIN)) {
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index e65412527b4..cbac9976752 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -30,7 +30,7 @@
 
     <build>
         <sourceDirectory>${project.basedir}/src</sourceDirectory>
-        <testSourceDirectory>${project.basedir}/../testlib/test</testSourceDirectory>
+        <testSourceDirectory>${project.basedir}/test</testSourceDirectory>
         <plugins>
             <plugin>
                 <groupId>com.goldin.plugins</groupId>
diff --git a/libraries/testlib/test/CollectionApiCheck.kt b/libraries/stdlib/test/CollectionApiCheck.kt
similarity index 100%
rename from libraries/testlib/test/CollectionApiCheck.kt
rename to libraries/stdlib/test/CollectionApiCheck.kt
diff --git a/libraries/testlib/test/CollectionTest.kt b/libraries/stdlib/test/CollectionTest.kt
similarity index 100%
rename from libraries/testlib/test/CollectionTest.kt
rename to libraries/stdlib/test/CollectionTest.kt
diff --git a/libraries/testlib/test/EnymerationIteratorTest.kt b/libraries/stdlib/test/EnymerationIteratorTest.kt
similarity index 100%
rename from libraries/testlib/test/EnymerationIteratorTest.kt
rename to libraries/stdlib/test/EnymerationIteratorTest.kt
diff --git a/libraries/testlib/test/GenerateStandardLib.kt b/libraries/stdlib/test/GenerateStandardLib.kt
similarity index 100%
rename from libraries/testlib/test/GenerateStandardLib.kt
rename to libraries/stdlib/test/GenerateStandardLib.kt
diff --git a/libraries/testlib/test/GetOrElseTest.kt b/libraries/stdlib/test/GetOrElseTest.kt
similarity index 100%
rename from libraries/testlib/test/GetOrElseTest.kt
rename to libraries/stdlib/test/GetOrElseTest.kt
diff --git a/libraries/testlib/test/IoTest.kt b/libraries/stdlib/test/IoTest.kt
similarity index 100%
rename from libraries/testlib/test/IoTest.kt
rename to libraries/stdlib/test/IoTest.kt
diff --git a/libraries/testlib/test/JavaClassTest.kt b/libraries/stdlib/test/JavaClassTest.kt
similarity index 100%
rename from libraries/testlib/test/JavaClassTest.kt
rename to libraries/stdlib/test/JavaClassTest.kt
diff --git a/libraries/testlib/test/ListTest.kt b/libraries/stdlib/test/ListTest.kt
similarity index 100%
rename from libraries/testlib/test/ListTest.kt
rename to libraries/stdlib/test/ListTest.kt
diff --git a/libraries/testlib/test/MapTest.kt b/libraries/stdlib/test/MapTest.kt
similarity index 100%
rename from libraries/testlib/test/MapTest.kt
rename to libraries/stdlib/test/MapTest.kt
diff --git a/libraries/testlib/test/MathTest.kt b/libraries/stdlib/test/MathTest.kt
similarity index 100%
rename from libraries/testlib/test/MathTest.kt
rename to libraries/stdlib/test/MathTest.kt
diff --git a/libraries/testlib/test/OldStdlibTest.kt b/libraries/stdlib/test/OldStdlibTest.kt
similarity index 100%
rename from libraries/testlib/test/OldStdlibTest.kt
rename to libraries/stdlib/test/OldStdlibTest.kt
diff --git a/libraries/testlib/test/PreconditionsTest.kt b/libraries/stdlib/test/PreconditionsTest.kt
similarity index 100%
rename from libraries/testlib/test/PreconditionsTest.kt
rename to libraries/stdlib/test/PreconditionsTest.kt
diff --git a/libraries/testlib/test/SetTest.kt b/libraries/stdlib/test/SetTest.kt
similarity index 100%
rename from libraries/testlib/test/SetTest.kt
rename to libraries/stdlib/test/SetTest.kt
diff --git a/libraries/testlib/test/StandardCollectionTest.kt b/libraries/stdlib/test/StandardCollectionTest.kt
similarity index 100%
rename from libraries/testlib/test/StandardCollectionTest.kt
rename to libraries/stdlib/test/StandardCollectionTest.kt
diff --git a/libraries/testlib/test/StdLibIssuesTest.kt b/libraries/stdlib/test/StdLibIssuesTest.kt
similarity index 100%
rename from libraries/testlib/test/StdLibIssuesTest.kt
rename to libraries/stdlib/test/StdLibIssuesTest.kt
diff --git a/libraries/testlib/test/StringTest.kt b/libraries/stdlib/test/StringTest.kt
similarity index 100%
rename from libraries/testlib/test/StringTest.kt
rename to libraries/stdlib/test/StringTest.kt
diff --git a/libraries/testlib/test/StringUtilTest.kt b/libraries/stdlib/test/StringUtilTest.kt
similarity index 100%
rename from libraries/testlib/test/StringUtilTest.kt
rename to libraries/stdlib/test/StringUtilTest.kt
diff --git a/libraries/testlib/test/Test.kt b/libraries/stdlib/test/Test.kt
similarity index 100%
rename from libraries/testlib/test/Test.kt
rename to libraries/stdlib/test/Test.kt
diff --git a/libraries/testlib/test/TestDslExample.kt b/libraries/stdlib/test/TestDslExample.kt
similarity index 100%
rename from libraries/testlib/test/TestDslExample.kt
rename to libraries/stdlib/test/TestDslExample.kt
diff --git a/libraries/testlib/test/concurrent/FListTest.kt b/libraries/stdlib/test/concurrent/FListTest.kt
similarity index 100%
rename from libraries/testlib/test/concurrent/FListTest.kt
rename to libraries/stdlib/test/concurrent/FListTest.kt
diff --git a/libraries/testlib/test/concurrent/SerialFunAndTupleTest.kt b/libraries/stdlib/test/concurrent/SerialFunAndTupleTest.kt
similarity index 100%
rename from libraries/testlib/test/concurrent/SerialFunAndTupleTest.kt
rename to libraries/stdlib/test/concurrent/SerialFunAndTupleTest.kt
diff --git a/libraries/testlib/test/dom/DomBuilderTest.kt b/libraries/stdlib/test/dom/DomBuilderTest.kt
similarity index 100%
rename from libraries/testlib/test/dom/DomBuilderTest.kt
rename to libraries/stdlib/test/dom/DomBuilderTest.kt
diff --git a/libraries/testlib/test/dom/DomTest.kt b/libraries/stdlib/test/dom/DomTest.kt
similarity index 100%
rename from libraries/testlib/test/dom/DomTest.kt
rename to libraries/stdlib/test/dom/DomTest.kt
diff --git a/libraries/testlib/test/language/JavaClassTest.kt b/libraries/stdlib/test/language/JavaClassTest.kt
similarity index 100%
rename from libraries/testlib/test/language/JavaClassTest.kt
rename to libraries/stdlib/test/language/JavaClassTest.kt
diff --git a/libraries/testlib/test/language/NullableCollectionsTest.kt b/libraries/stdlib/test/language/NullableCollectionsTest.kt
similarity index 100%
rename from libraries/testlib/test/language/NullableCollectionsTest.kt
rename to libraries/stdlib/test/language/NullableCollectionsTest.kt
diff --git a/libraries/testlib/test/language/StringExpressionExampleTest.kt b/libraries/stdlib/test/language/StringExpressionExampleTest.kt
similarity index 100%
rename from libraries/testlib/test/language/StringExpressionExampleTest.kt
rename to libraries/stdlib/test/language/StringExpressionExampleTest.kt
diff --git a/libraries/testlib/test/language/main/MainFunction.kt b/libraries/stdlib/test/language/main/MainFunction.kt
similarity index 100%
rename from libraries/testlib/test/language/main/MainFunction.kt
rename to libraries/stdlib/test/language/main/MainFunction.kt
diff --git a/libraries/testlib/test/properties/PropertiesTest.kt b/libraries/stdlib/test/properties/PropertiesTest.kt
similarity index 100%
rename from libraries/testlib/test/properties/PropertiesTest.kt
rename to libraries/stdlib/test/properties/PropertiesTest.kt
diff --git a/libraries/testlib/test/regressions/Kt1149.kt b/libraries/stdlib/test/regressions/Kt1149.kt
similarity index 100%
rename from libraries/testlib/test/regressions/Kt1149.kt
rename to libraries/stdlib/test/regressions/Kt1149.kt
diff --git a/libraries/testlib/test/regressions/kt1172.kt b/libraries/stdlib/test/regressions/kt1172.kt
similarity index 100%
rename from libraries/testlib/test/regressions/kt1172.kt
rename to libraries/stdlib/test/regressions/kt1172.kt
diff --git a/libraries/testlib/test/regressions/kt1202.kt b/libraries/stdlib/test/regressions/kt1202.kt
similarity index 100%
rename from libraries/testlib/test/regressions/kt1202.kt
rename to libraries/stdlib/test/regressions/kt1202.kt
diff --git a/libraries/testlib/test/template/HtmlTemplateTest.kt b/libraries/stdlib/test/template/HtmlTemplateTest.kt
similarity index 100%
rename from libraries/testlib/test/template/HtmlTemplateTest.kt
rename to libraries/stdlib/test/template/HtmlTemplateTest.kt
diff --git a/libraries/testlib/test/template/StringTemplateTest.kt b/libraries/stdlib/test/template/StringTemplateTest.kt
similarity index 100%
rename from libraries/testlib/test/template/StringTemplateTest.kt
rename to libraries/stdlib/test/template/StringTemplateTest.kt