diff --git a/src/etc/testcases/taskdefs/optional/junitreport.xml b/src/etc/testcases/taskdefs/optional/junitreport.xml
index 34523f092..15cb67cc5 100644
--- a/src/etc/testcases/taskdefs/optional/junitreport.xml
+++ b/src/etc/testcases/taskdefs/optional/junitreport.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 
 <project name="junitreport-test" basedir="." default="reports">
 
     <property name="jrdir" location="junitreport"/>
     <property name="outputdir" location="${jrdir}/test"/>
 
-    <!-- reports1 take care of transformation of 2 test result files and 
-         produce reports according to the default format (frames) 
+    <!-- reports1 take care of transformation of 2 test result files and
+         produce reports according to the default format (frames)
          needed for testNoFileJunitNoFrames -->
     <target name="reports1">
         <mkdir dir="${outputdir}"/>
@@ -29,7 +29,7 @@
             <report todir="${outputdir}/html"/>
         </junitreport>
     </target>
-    
+
     <target name="testIncompleteFile">
         <mkdir dir="${outputdir}/html"/>
         <junitreport todir="${outputdir}">
@@ -40,7 +40,7 @@
             <report todir="${outputdir}/html"/>
         </junitreport>
     </target>
-    
+
     <target name="testWrongElement">
         <mkdir dir="${outputdir}/html"/>
         <junitreport todir="${outputdir}">
@@ -50,7 +50,7 @@
             </fileset>
             <report todir="${outputdir}/html"/>
         </junitreport>
-    </target>    
+    </target>
 
     <target name="testNamespace">
         <mkdir dir="${outputdir}/html"/>
@@ -61,19 +61,48 @@
             </fileset>
             <report todir="${outputdir}/html"/>
         </junitreport>
-    </target>        
-    
+    </target>
+
     <target name="clean">
         <delete dir="${outputdir}"/>
     </target>
 
-  <target name="testStackTraceLineBreaks">
-    <mkdir dir="${outputdir}/html"/>
-    <junitreport todir="${outputdir}">
-      <fileset dir="${jrdir}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report todir="${outputdir}/html"/>
-    </junitreport>
-  </target>        
-</project>
+    <target name="testStackTraceLineBreaks">
+        <mkdir dir="${outputdir}/html"/>
+        <junitreport todir="${outputdir}">
+            <fileset dir="${jrdir}">
+                <include name="TEST-*.xml"/>
+            </fileset>
+            <report todir="${outputdir}/html"/>
+        </junitreport>
+    </target>
+
+    <target name="testSpecialSignsInSrcPath">
+        <mkdir dir="${outputdir}/html"/>
+        <mkdir dir="${outputdir}/test# $$%§&amp;-!cases"/>
+        <copy todir="${outputdir}/test# $$%§&amp;-!cases">
+            <fileset dir="junitreport" includes="TEST-*.xml"/>
+        </copy>
+        <junitreport todir="${outputdir}/html">
+            <fileset dir="${outputdir}/test# $$%§&amp;-!cases">
+                <include name="TEST-*.xml"/>
+            </fileset>
+            <report todir="${outputdir}/html"/>
+        </junitreport>
+    </target>
+
+    <target name="testSpecialSignsInHtmlPath">
+        <mkdir dir="${outputdir}/html# $$%§&amp;-!report"/>
+        <mkdir dir="${outputdir}/test"/>
+        <copy todir="${outputdir}/test">
+            <fileset dir="junitreport" includes="TEST-*.xml"/>
+        </copy>
+        <junitreport todir="${outputdir}/html# $$%§&amp;-!report">
+            <fileset dir="${outputdir}/test">
+                <include name="TEST-*.xml"/>
+            </fileset>
+            <report todir="${outputdir}/html# $$%§&amp;-!report"/>
+        </junitreport>
+    </target>
+
+</project>
\ No newline at end of file
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java
index b41d567c8..f0e04b04e 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java
@@ -106,5 +106,19 @@ public class JUnitReportTest extends BuildFileTest {
         }
     }
 
-}
 
+    // Bugzilla Report 38477
+    public void testSpecialSignsInSrcPath() throws Exception {
+        executeTarget("testSpecialSignsInSrcPath");
+        if (! new File(System.getProperty("root"), "src/etc/testcases/taskdefs/optional/junitreport/test/html/index.html").exists()) {
+            fail("No index.html present. Not generated?");
+        }
+    }
+    public void testSpecialSignsInHtmlPath() throws Exception {
+        executeTarget("testSpecialSignsInHtmlPath");
+        if (! new File(System.getProperty("root"), "src/etc/testcases/taskdefs/optional/junitreport/test/html# $%§&-!report/index.html").exists()) {
+            fail("No index.html present. Not generated?");
+        }
+    }
+
+}
\ No newline at end of file