diff --git a/custom_rules.xml b/custom_rules.xml
index 944377a7c..7747834aa 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="custom_rules" default="fetch-test-report">
-
-  <target name="fetch-test-report">
-    <echo>Downloading XML test report…</echo>
-    <mkdir dir="junitreports"/>
-    <exec executable="${adb}" failonerror="true">
-      <arg line="${adb.device.arg}"/>
-      <arg value="pull" />
-      <arg value="/data/data/${tested.manifest.package}/files/junit-report.xml" />
-      <arg value="junitreports/junit-report.xml" />
-    </exec>
-  </target>
+<project name="custom_rules">
 
   <target name="javadoc" description="Generate Javadocs">
     <javadoc sourcepath="${source.dir}"
diff --git a/test/.gitignore b/test/.gitignore
index 22273c3f4..b8d12b236 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -9,3 +9,4 @@
 /*.iml
 out
 /.settings/
+junit-report.xml
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 3562f038e..12eccb755 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -15,7 +15,7 @@
     the package of org.fdroid.fdroid.  To run the tests use the command:
     "adb shell am instrument -w org.fdroid.fdroid.tests/android.test.InstrumentationTestRunner"
     -->
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
+    <instrumentation android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
                      android:targetPackage="org.fdroid.fdroid"
                      android:label="Tests for org.fdroid.fdroid" />
 </manifest>
diff --git a/test/ant.properties b/test/ant.properties
index 16244024c..99458bdd5 100644
--- a/test/ant.properties
+++ b/test/ant.properties
@@ -16,3 +16,4 @@
 # The password will be asked during the build when you use the 'release' target.
 
 tested.project.dir=..
+test.runner=com.zutubi.android.junitreport.JUnitReportTestRunner
diff --git a/test/custom_rules.xml b/test/custom_rules.xml
new file mode 100644
index 000000000..ee90d3fac
--- /dev/null
+++ b/test/custom_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="test_custom_rules" default="fetch-test-report">
+
+  <target name="fetch-test-report">
+    <xpath
+        expression="/manifest/@package"
+        input="${tested.project.dir}/AndroidManifest.xml"
+        output="tested.package" />
+    <echo>Downloading XML test report (/data/data/${tested.package}/files/junit-report.xml)…</echo>
+    <mkdir dir="junitreports"/>
+    <exec executable="${adb}" failonerror="true">
+      <arg line="${adb.device.arg}"/>
+      <arg value="pull" />
+      <arg value="/data/data/${tested.package}/files/junit-report.xml" />
+      <arg value="junit-report.xml" />
+    </exec>
+  </target>
+
+</project>
diff --git a/test/libs/android-junit-report-1.5.8.README b/test/libs/android-junit-report-1.5.8.README
new file mode 100644
index 000000000..a89c98533
--- /dev/null
+++ b/test/libs/android-junit-report-1.5.8.README
@@ -0,0 +1,5 @@
+
+Needed for Jenkins to get JUnit reports.
+
+* https://github.com/jsankey/android-junit-report
+* https://github.com/downloads/jsankey/android-junit-report/android-junit-report-1.5.8.jar
diff --git a/test/libs/android-junit-report-1.5.8.jar b/test/libs/android-junit-report-1.5.8.jar
new file mode 100644
index 000000000..09e6a2d4f
Binary files /dev/null and b/test/libs/android-junit-report-1.5.8.jar differ