diff --git a/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-debug-snippet.xml b/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-debug-snippet.xml
--- a/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-debug-snippet.xml
+++ b/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-debug-snippet.xml
@@ -68,6 +68,9 @@
     </target>
     <target name="-prepare-execution" depends="-init-debug-args">
         <macrodef name="junit-debug-template">
+            <!-- This macros is intended to be used in conjunction with the
+            org.apache.tools.ant.module.spi.AntLogger. Note, the last task
+            deletes just created test report. -->
             <element name="extra-args" implicit="yes" optional="yes"/>
             <sequential>
                 <translate-classpath classpath="${classpath}" targetProperty="classpath-translated" />
@@ -103,7 +106,7 @@
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </syspropertyset>
                 </java>
-                <!-- cannot delete ${test.result.file} yet, will be parsed soon; XXX deleteOnExit? -->
+                <delete file="${test.result.file}" deleteonexit="true" />
             </sequential>
         </macrodef>
     </target>
diff --git a/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-snippet.xml b/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-snippet.xml
--- a/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-snippet.xml
+++ b/java.source.ant/src/org/netbeans/modules/java/source/ant/resources/junit-snippet.xml
@@ -48,34 +48,50 @@
     </target>
     <target name="-prepare-execution">
         <macrodef name="junit-template">
-            <element name="test-spec" implicit="yes"/>
+            <!-- This macros is intended to be used in conjunction with the
+            org.apache.tools.ant.module.spi.AntLogger. Note, the last task
+            deletes just created test report. -->
+            <element name="extra-args" implicit="yes" optional="yes"/>
             <sequential>
                 <translate-classpath classpath="${classpath}" targetProperty="classpath-translated" />
                 <property name="run.jvmargs" value="" />
                 <property name="work.dir" value="${basedir}"/>
-                <junit showoutput="true" fork="true" dir="${work.dir}" jvm="${platform.java}">
-                    <test-spec/>
-                    <classpath path="${classpath-translated}" />
+                <!-- needed in order to display test names: -->
+                <property name="test.result.file" location="${java.io.tmpdir}/TEST-${classname}.xml"/>
+                <java classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" fork="true" dir="${work.dir}" jvm="${platform.java}">
+                    <classpath>
+                        <fileset dir="${ant.home}" includes="patches/*.jar"/>
+                        <path path="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar"/>
+                        <path path="${classpath-translated}"/>
+                    </classpath>
                     <jvmarg value="-ea"/>
                     <jvmarg line="${run.jvmargs}"/>
-                    <formatter type="brief" usefile="false"/>
+                    <arg value="${classname}"/>
+                    <arg value="filtertrace=true"/>
+                    <arg value="haltOnError=false"/>
+                    <arg value="haltOnFailure=false"/>
+                    <arg value="showoutput=true"/>
+                    <arg value="outputtoformatters=true"/>
+                    <arg value="logtestlistenerevents=true"/>
+                    <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                    <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.result.file}"/>
+                    <extra-args/>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </syspropertyset>
-                </junit>
+                </java>
+                <delete file="${test.result.file}" deleteonexit="true" />
             </sequential>
         </macrodef>
         <translate-classpath classpath="${classpath}" targetProperty="classpath-translated"/>
     </target>
     <target name="-test-class" depends="-prepare-execution" unless="methodname">
-        <junit-template>
-            <test name="${classname}"/>
-        </junit-template>
+        <junit-template />
     </target>
     <target name="-test-method" depends="-check-run-test-single-method-supported,-prepare-execution" if="methodname">
         <junit-template>
-            <test name="${classname}" methods="${methodname}"/>
+          <arg value="methods=${methodname}"/>
         </junit-template>
     </target>
     <target name="test" depends="-test-class,-test-method"/>