Index: /applications/viewer/jmapviewer/build.xml
===================================================================
--- /applications/viewer/jmapviewer/build.xml	(revision 36223)
+++ /applications/viewer/jmapviewer/build.xml	(revision 36224)
@@ -188,6 +188,7 @@
             </classpath>
         </javac>
-        <jacoco:agent enabled="@{coverage}" includes="${jacoco.includes}"
-                      inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}" property="jacocoagent@{testfamily}@{testITsuffix}" if:true="@{coverage}"/>
+        <jacoco:agent destfile="report/jacoco.exec" enabled="${coverage}" includes="${jacoco.includes}" dumponexit="true"
+                      inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}"
+                      property="jacocoagent" if:true="${coverage}"/>
         <junitlauncher printsummary="yes">
             <classpath>
@@ -199,4 +200,5 @@
                 <fileset dir="bintest" includes="**/*Test.class"/>
                 <fork>
+                    <jvmarg value="${jacocoagent}" if:set="jacocoagent" />
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
                 </fork>
@@ -206,4 +208,18 @@
             </testclasses>
         </junitlauncher>
+        <jacoco:report>
+            <executiondata>
+                <fileset dir="report" includes="*.exec"/>
+            </executiondata>
+            <structure name="JMapViewer Test Coverage">
+                <classfiles>
+                    <fileset dir="bin" includes="org/openstreetmap/"/>
+                </classfiles>
+                <sourcefiles encoding="UTF-8">
+                    <fileset dir="src" includes="org/openstreetmap/"/>
+                </sourcefiles>
+            </structure>
+            <xml destfile="report/jacoco.xml"/>
+        </jacoco:report>
     </target>