diff --git a/.gitignore b/.gitignore
index d77406d9e..ee06078d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,5 @@ submodules/externals/build/cunit/CUnit/
.idea
build
linphone-android.iml
-junit-report.xml
+linphone-junit-report.xml
+liblinphone-junit-report.xml
diff --git a/liblinphone_tester/.classpath b/liblinphone_tester/.classpath
index 0e0620221..7e1fd65d7 100644
--- a/liblinphone_tester/.classpath
+++ b/liblinphone_tester/.classpath
@@ -9,5 +9,6 @@
+
diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile
index a5d66a92e..d1f3db279 100644
--- a/liblinphone_tester/Makefile
+++ b/liblinphone_tester/Makefile
@@ -4,3 +4,4 @@ all:
run-all-tests: all
ant test
+ adb shell run-as org.linphone.tester cat /data/data/org.linphone.tester/files/junit-report.xml > liblinphone-junit-report.xml
diff --git a/liblinphone_tester/ant.properties b/liblinphone_tester/ant.properties
index c3a2c6428..1c4ad6f9f 100644
--- a/liblinphone_tester/ant.properties
+++ b/liblinphone_tester/ant.properties
@@ -1 +1,2 @@
source.dir=src:../submodules/linphone/mediastreamer2/java/src:../submodules/linphone/java/j2se:../submodules/linphone/java/common:../submodules/linphone/java/impl
+test.runner=com.zutubi.android.junitreport.JUnitReportTestRunner
diff --git a/liblinphone_tester/libs/android-junit-report-1.5.8.jar b/liblinphone_tester/libs/android-junit-report-1.5.8.jar
new file mode 100644
index 000000000..09e6a2d4f
Binary files /dev/null and b/liblinphone_tester/libs/android-junit-report-1.5.8.jar differ
diff --git a/liblinphone_tester/src/org/linphone/tester/TestRunner.java b/liblinphone_tester/src/org/linphone/tester/TestRunner.java
index c3c726eda..d45675e5a 100644
--- a/liblinphone_tester/src/org/linphone/tester/TestRunner.java
+++ b/liblinphone_tester/src/org/linphone/tester/TestRunner.java
@@ -1,13 +1,12 @@
package org.linphone.tester;
-import java.io.IOException;
-
import junit.framework.TestSuite;
import android.os.Bundle;
-import android.test.InstrumentationTestRunner;
+
+import com.zutubi.android.junitreport.JUnitReportTestRunner;
-public class TestRunner extends InstrumentationTestRunner {
+public class TestRunner extends JUnitReportTestRunner {
String mSuite = null;
String mTest = null;
diff --git a/tests/Makefile b/tests/Makefile
index fe9c801bd..12b2c406c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -8,7 +8,7 @@ run-basic-tests:
ant debug
ant installd
adb shell am instrument -w -e size small org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner
- adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > junit-report.xml
+ adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > linphone-junit-report.xml
run-all-tests:
$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test
@@ -17,4 +17,4 @@ run-all-tests:
ant debug
ant installd
adb shell am instrument -w -e size large org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner
- adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > junit-report.xml
+ adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > linphone-junit-report.xml