diff --git a/WHATSNEW b/WHATSNEW
index 4f2a703b6..5a4cbb392 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -34,6 +34,9 @@ Fixed bugs:
 
 * <tstamp>'s prefix attribute failed to apply to nested <format> elements.
 
+* <junitreport> created an empty junit-noframes.html if no format had
+  been specified.
+
 Other changes:
 --------------
 
diff --git a/build.xml b/build.xml
index dc97ec03e..e600c4c32 100644
--- a/build.xml
+++ b/build.xml
@@ -1245,6 +1245,16 @@
 
   <target name="run-tests" depends="dump-info,compile-tests,probe-offline" if="junit.present">
 
+    <condition property="run.junitreport">
+      <or>
+        <isset property="xalan2.present"/>
+        <and>
+          <isset property="xalan.present"/>
+          <isset property="bsf.present"/>
+        </and>
+      </or>
+    </condition>
+
     <junit printsummary="${junit.summary}" haltonfailure="yes"
            filtertrace="${junit.filtertrace}"
            fork="${junit.fork}">
@@ -1325,6 +1335,8 @@
                    unless="trax.impl.present"/>
           <exclude name="${ant.package}/types/XMLCatalogBuildFileTest.java"
                    unless="trax.impl.present"/>
+          <exclude name="${optional.package}/junit/JUnitReportTest.java"
+                   unless="run.junitreport"/>
 
           <!-- needs BSF to work -->
           <exclude name="${optional.package}/XalanLiaisonTest.java"