Index: build.xml
===================================================================
--- build.xml	(revision 1205789)
+++ build.xml	(working copy)
@@ -1067,6 +1067,10 @@
     </javac>
   </target>
 
+  <!-- Default JUnit formatter log output -->
+  <property name="junit.formatter.type" value="plain"/>
+  <property name="junit.formatter.extension" value=".txt"/>
+
   <target name="test" description="Runs the JUnit test cases"
           depends="test-bio,test-nio,test-apr" >
     <fail if="test.result.error" message='Some tests completed with an Error. See ${tomcat.build}/logs for details, search for "FAILED".' />
@@ -1076,20 +1080,20 @@
   <target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors."
           depends="test-compile,deploy" if="${execute.test.bio}">
     <runtests protocol="org.apache.coyote.http11.Http11Protocol"
-              extension=".BIO.txt" />
+              extension=".BIO" />
   </target>
 
   <target name="test-nio" description="Runs the JUnit test cases for NIO. Does not stop on errors."
           depends="test-compile,deploy" if="${execute.test.nio}">
     <runtests protocol="org.apache.coyote.http11.Http11NioProtocol"
-              extension=".NIO.txt" />
+              extension=".NIO" />
   </target>
 
   <target name="test-apr" description="Runs the JUnit test cases for APR. Does not stop on errors."
           depends="test-compile,deploy,test-apr-exists"
           if="${apr.exists}">
     <runtests protocol="org.apache.coyote.http11.Http11AprProtocol"
-              extension=".APR.txt" />
+              extension=".APR" />
   </target>
 
   <target name="test-apr-exists" description="Checks for APR lib"
@@ -1122,7 +1126,7 @@
         <sysproperty key="tomcat.test.protocol" value="@{protocol}" />
         <sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" />
 
-        <formatter type="plain" usefile="true" extension="@{extension}"/>
+        <formatter type="${junit.formatter.type}" usefile="true" extension="@{extension}${junit.formatter.extension}"/>
 
         <!-- If test.entry is defined, run a single test, otherwise run all valid tests -->
         <test todir="${tomcat.build}/logs" name="${test.entry}" if="test.entry"/>