diff --git a/build-tools/build.xml b/build-tools/build.xml
index 8e60a1f36df..4ac2b4b017c 100644
--- a/build-tools/build.xml
+++ b/build-tools/build.xml
@@ -251,6 +251,22 @@
     </macrodef>
 
 
+    <!-- Compiles "testlib" Kotlin tests (file, dir, module => dir/jar) -->
+    <!-- Currently disabled, see "buildToolsTest" -->
+    <macrodef name="testlib-tests">
+        <sequential>
+            <kotlinc-dir file   = "${basedir}/testlib/test/CollectionTest.kt"/>
+            <kotlinc-dir file   = "${basedir}/testlib/test/Test.kt"/>
+            <kotlinc-dir srcdir = "${basedir}/testlib/test"/>
+
+            <kotlinc-jar file   = "${basedir}/testlib/test/CollectionTest.kt"/>
+            <kotlinc-jar file   = "${basedir}/testlib/test/Test.kt"/>
+            <kotlinc-jar srcdir = "${basedir}/testlib/test"/>
+            <kotlinc-jar module = "${basedir}/build-tools/test/modules/Testlib.kts"/>
+        </sequential>
+    </macrodef>
+
+
     <!-- Compiles and runs a Kotlin module -->
     <macrodef name="module-tests">
         <sequential>
@@ -333,6 +349,7 @@
         <hello-tests/>
         <longer-examples-tests/>
         <module-tests/>
+        <!--<testlib-tests/>-->
         <compilation-fail-test/>
     </target>
 </project>
diff --git a/build-tools/test/modules/Testlib.kts b/build-tools/test/modules/Testlib.kts
new file mode 100644
index 00000000000..0d58ad03889
--- /dev/null
+++ b/build-tools/test/modules/Testlib.kts
@@ -0,0 +1,9 @@
+import kotlin.modules.*
+
+val homeDir = "../../../testlib/test"
+
+fun project() {
+    module("Testlib") {
+        sources += homeDir
+    }
+}