Index: build.xml
===================================================================
--- build.xml	(revision 3911)
+++ build.xml	(working copy)
@@ -812,16 +812,12 @@
     </target>
 
     <target name="generate-report">
-        <!-- WebLogic and WebSphere servers require specific jaxp.properties for generating report -->
-        <delete file="${env.JAVA_HOME}/jre/lib/jaxp.properties" failonerror="false"/>
-        <copy todir="${env.JAVA_HOME}/jre/lib" file="${eclipselink.jpa.test}/resource/${server.name}/jaxp.properties" failonerror="false"/>
         <junitreport todir="${eclipselink.jpa.test}/${report.dir}">
             <fileset dir="${eclipselink.jpa.test}/${report.dir}">
                 <include name="*test-results.xml"/>
             </fileset>
             <report format="noframes" todir="${eclipselink.jpa.test}/${report.dir}"/>
         </junitreport>
-        <delete file="${env.JAVA_HOME}/jre/lib/jaxp.properties" failonerror="false"/>
     </target>
 
     <!-- Runs the test using the PromptTestRunner -->
@@ -1242,6 +1238,14 @@
         </junit>
     </target>
 
+    <target name="generate-servertest-report">
+        <!-- WebLogic and WebSphere servers require specific jaxp.properties for generating report -->
+        <delete file="${env.JAVA_HOME}/jre/lib/jaxp.properties" failonerror="false"/>
+        <copy todir="${env.JAVA_HOME}/jre/lib" file="${eclipselink.jpa.test}/resource/${server.name}/jaxp.properties" failonerror="false"/>
+        <antcall target="generate-report" inheritRefs="true"/>
+        <delete file="${env.JAVA_HOME}/jre/lib/jaxp.properties" failonerror="false"/>
+    </target>
+
     <!-- Server Tests -->
     <!-- Run the LRG -->
     <target name="server-test">
@@ -1271,12 +1275,12 @@
         <antcall target="server-test-oracle-timestamptz" inheritRefs="true"/>
         <antcall target="server-test-custom-features" inheritRefs="true"/>
         <antcall target="server-test-struct-converter" inheritRefs="true"/>
-        <antcall target="generate-report" inheritRefs="true"/>
+        <antcall target="generate-servertest-report" inheritRefs="true"/>
     </target>
 
     <target name="server-test-oracle-proxy" depends="clean-test">
         <antcall target="server-test-proxy-authentication" inheritRefs="true"/>
-        <antcall target="generate-report" inheritRefs="true"/>
+        <antcall target="generate-servertest-report" inheritRefs="true"/>
     </target>
 
     <target name="server-test-advanced">