diff --git a/build.xml b/build.xml
index d136706a8..af6582970 100644
--- a/build.xml
+++ b/build.xml
@@ -277,7 +277,7 @@
   <!-- =================================================================== -->
   <!-- Compile testcases                                                   -->
   <!-- =================================================================== -->
-  <target name="compiletests" depends="jar">
+  <target name="compiletests" depends="jar" if="junit.present">
     <mkdir dir="${build.tests}"/>
 
     <javac srcdir="${src.tests.dir}"
@@ -288,16 +288,6 @@
         <pathelement location="${lib.dir}/${name}.jar" />
         <path refid="classpath" />
       </classpath>
-      <include name="**/*.java"/>
-      <exclude name="**/AllJUnitTests.java" unless="junit.present" />
-      <exclude name="**/EnumeratedAttributeTest.java" unless="junit.present" />
-      <exclude name="**/IntrospectionHelperTest.java" unless="junit.present" />
-      <exclude name="**/PathTest.java" unless="junit.present" />
-      <exclude name="**/CommandlineTest.java" unless="junit.present" />
-      <exclude name="**/CommandlineJavaTest.java" unless="junit.present" />
-      <exclude name="**/ProjectTest.java" unless="junit.present" />
-      <exclude name="**/PatternSetTest.java" unless="junit.present" />
-      <exclude name="**/FileSetTest.java" unless="junit.present" />
     </javac>
    </target>
 
@@ -305,7 +295,7 @@
   <!-- Run testcase                                                        -->
   <!-- =================================================================== -->
   <target name="runtests" depends="compiletests" if="junit.present">
-    <junit printsummary="yes" fork="yes" haltonfailure="yes">
+    <junit printsummary="no" fork="yes" haltonfailure="yes">
       <classpath>
         <pathelement location="${lib.dir}/${name}.jar" />
         <pathelement location="${build.tests}" />
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
index 65fbc1c50..6d6443025 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
@@ -138,9 +138,11 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter {
             } catch (IOException ioex) {
                 throw new BuildException("Unable to write output", ioex);
             } finally {
-                try {
-                    out.close();
-                } catch (IOException e) {}
+                if (out != System.out && out != System.err) {
+                    try {
+                        out.close();
+                    } catch (IOException e) {}
+                }
             }
         }
     }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
index ea7751d51..1f54b3f72 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
@@ -127,9 +127,11 @@ public class SummaryJUnitResultFormatter implements JUnitResultFormatter {
         } catch (IOException ioex) {
             throw new BuildException("Unable to write summary output", ioex);
         } finally {
-            try {
-                out.close();
-            } catch (IOException e) {}
+            if (out != System.out && out != System.err) {
+                try {
+                    out.close();
+                } catch (IOException e) {}
+            }
         }
     }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
index f9e66fc73..590268509 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
@@ -142,10 +142,12 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter {
             } catch(IOException exc) {
                 throw new BuildException("Unable to write log file", exc);
             } finally {
-                if (wri != null) {
-                    try {
-                        wri.close();
-                    } catch (IOException e) {}
+                if (out != System.out && out != System.err) {
+                    if (wri != null) {
+                        try {
+                            wri.close();
+                        } catch (IOException e) {}
+                    }
                 }
             }
         }