diff --git a/build.xml b/build.xml
index f510a8feb..bddd46a5f 100644
--- a/build.xml
+++ b/build.xml
@@ -169,9 +169,11 @@
 
 <!-- ====================================================================== -->
 
+  <!-- Used to obtain more detailed info on test failures -->
   <target name="test"  depends="compile.tests"
           description="Run all unit test cases">
-    <junit printsummary="yes" haltonfailure="yes">
+    <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
+      <formatter type="brief" />
       <classpath>
         <pathelement location="${build.classes}"/>
         <pathelement location="${build.tests}"/>
@@ -180,7 +182,13 @@
 
       <batchtest fork="yes">
         <fileset dir="${source.test}">
-          <include name="**/TestAllPackages.java"/>
+          <include name="**/map/TestT*.java"/>
+          <exclude name="**/TestAll*.java"/>
+          <exclude name="**/TestArrayList.java"/>
+          <exclude name="**/TestLinkedList.java"/>
+          <exclude name="**/TestHashMap.java"/>
+          <exclude name="**/TestTreeMap.java"/>
+          <exclude name="**/TestTypedCollection.java"/>
         </fileset>
       </batchtest>
     </junit>