diff --git a/build.xml b/build.xml
index 8af56e48344..0b4d78d21b8 100644
--- a/build.xml
+++ b/build.xml
@@ -86,6 +86,35 @@
         </java>
     </target>
 
+    <target name="testlib" depends="compileTestlib">
+        <mkdir dir="${output}/test-reports"/>
+
+        <junit printsummary="yes" haltonfailure="no">
+          <classpath>
+              <pathelement location="${kotlin-home}/lib/kotlin-runtime.jar"/>
+              <pathelement location="${basedir}/testlib/lib/junit-4.9.jar"/>
+              <fileset dir="${basedir}/testlib/lib">
+                <include name="**/*.jar"/>
+              </fileset>
+            <pathelement path="${output}/classes/testlib"/>
+          </classpath>
+
+          <formatter type="plain"/>
+
+<!--
+          <test name="my.test.TestCase" haltonfailure="no" outfile="result">
+            <formatter type="xml"/>
+          </test>
+-->
+
+          <batchtest fork="yes" todir="${output}/test-reports">
+            <fileset dir="${output}/classes/testlib">
+              <include name="**/*Test.*"/>
+            </fileset>
+          </batchtest>
+        </junit>
+    </target>
+
     <target name="compileJDKHeaders" depends="jar">
         <mkdir dir="${output}/classes/stdlib"/>
         <java classname="org.jetbrains.jet.cli.KotlinCompiler">
diff --git a/testlib/test/Test.kt b/testlib/test/Test.kt
index dae55b52080..32dee921d8b 100644
--- a/testlib/test/Test.kt
+++ b/testlib/test/Test.kt
@@ -9,7 +9,7 @@ import org.junit.runner.*
 import org.junit.runner.notification.*
 import junit.framework.*
 
-protected class BuiltTest<T>(name: String, val builder: TestBuilder<T>, val test: BuiltTest<T>.() -> Unit) : TestCase(name) {
+protected class TestBuilt<T>(name: String, val builder: TestBuilder<T>, val test: TestBuilt<T>.() -> Unit) : TestCase(name) {
     private var myState: T? = null
 
     var state : T
@@ -32,12 +32,12 @@ protected class BuiltTest<T>(name: String, val builder: TestBuilder<T>, val test
 open class TestBuilder<T>(name: String) {
     val mySuite : TestSuite = TestSuite(name)
 
-    public var setUp : BuiltTest<T>.() -> Unit = {}
+    public var setUp : TestBuilt<T>.() -> Unit = {}
 
-    public var tearDown : BuiltTest<T>.() -> Unit = {}
+    public var tearDown : TestBuilt<T>.() -> Unit = {}
 
-    fun String.minus(test: BuiltTest<T>.() -> Unit) {
-        mySuite.addTest(BuiltTest<T>(this, this@TestBuilder, test))
+    fun String.minus(test: TestBuilt<T>.() -> Unit) {
+        mySuite.addTest(TestBuilt<T>(this, this@TestBuilder, test))
     }
 }