diff --git a/build.xml b/build.xml
index a46a980f5..47dc4e0bf 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
 
 <!--
         "math" component of the Jakarta Commons Subproject
-        $Id: build.xml,v 1.2 2003/05/12 19:02:11 rdonkin Exp $
+        $Id: build.xml,v 1.3 2003/05/18 00:55:18 tobrien Exp $
 -->
 
 
@@ -114,6 +114,7 @@
     <mkdir dir="${build.home}/classes"/>
     <mkdir dir="${build.home}/conf"/>
     <mkdir dir="${build.home}/tests"/>
+    <mkdir dir="${build.home}/test-reports"/>
   </target>
 
 
@@ -222,19 +223,22 @@
 <!-- ========== Unit Test Targets ========================================= -->
 
 
-  <target name="test"  depends="compile.tests,
-                                test.math"
-   description="Run all unit test cases">
-  </target>
-
-
-  <target name="test.math" depends="compile.tests">
-    <echo message="Running math tests ..."/>
-    <java classname="${test.runner}" fork="yes"
-        failonerror="${test.failonerror}">
-      <arg value="org.apache.commons.math.MathTestSuite"/>
+  <!-- Run all the JUnit Tests -->
+  <target name="test" depends="compile.tests" description="Compiles and runs unit test cases">
+    <record name="${build.home}/test-output.txt" append="no" action="start"/>
+    <junit printsummary="yes" haltonfailure="yes">
       <classpath refid="test.classpath"/>
-    </java>
+
+      <formatter type="plain"/>
+
+      <batchtest fork="yes" todir="${build.home}/test-reports">
+        <fileset dir="${test.home}">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*AbstractTest.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+    <record name="${build.home}/test-output.txt" action="stop"/>
   </target>
 
 </project>