diff --git a/.gitignore b/.gitignore
index ac8c31999..06c6024eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@ liblinphone-junit-report.xml
 liblinphonetester_*.zip
 libs
 linphone-android.iml
-linphone-junit-report.xml
+linphone-junit-report*.xml
 linphonetester_*.zip
 lint.xml
 local.properties
diff --git a/tests/Makefile b/tests/Makefile
index e8690cb6e..7d83f2617 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -17,11 +17,9 @@ all: clean
 	$(ANT) debug install
 
 run-basic-tests: all
-	$(ANT) test
-	adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml 2>/dev/null > linphone-junit-report.xml
+	$(ANT) test -Dtest.size=small
 	if [ ! -s linphone-junit-report.xml ]; then exit 1; fi
 
 run-all-tests: all
-	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 2>/dev/null > linphone-junit-report.xml
+	$(ANT) test -Dtest.size=large
 	if [ ! -s linphone-junit-report.xml ]; then exit 1; fi
diff --git a/tests/custom_rules.xml b/tests/custom_rules.xml
index 39d0d5358..f429373a2 100644
--- a/tests/custom_rules.xml
+++ b/tests/custom_rules.xml
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="custom_rules">
+<project name="linphone-tester">
 	<target name="test">
 		<property name="output.file" value="./tests.output" />
-                <tstamp>
-                        <format property="archive.name"
-                        pattern="'linphonetester_'yyyyMMdd_HHmmss" />
-                </tstamp>
-                <echo>Adb log files are put in ${archive.name}.zip</echo>
-
-                <exec executable="adb" >
-                        <arg value="logcat" />
-                        <arg value="-c" />
-                </exec>
-                <exec executable="./adb-log-start.sh" >
-                        <arg value=" ${archive.name}" />
-                </exec>
-                <exec executable="bash">
-                        <arg value="-c"/>
-                        <!-- use 'tee' command to write in file AND on stdout.
-                        First is used below to check if tests failed or not while second
-                        is used to get output in real time -->
-                        <arg value="adb shell am instrument -r -w -e size small org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner | tee ${output.file}"/>
-                </exec>
-                <exec executable="bash" >
-                        <arg value="-c" />
-                        <arg value="kill `cat adb.pid`" />
-                </exec>
-                <exec executable="bash">
-                        <arg value="-c"/>
-                        <arg value="adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > linphone-junit-report.xml"/>
-                </exec>
-                <zip destfile="${archive.name}.zip">
-                        <fileset dir="." includes="${archive.name}"/>
-                </zip>
-                <fail message="Tests failed">
-                        <condition>
-                                        <resourcecontains resource="${output.file}" substring="FAILURES" />
-                        </condition>
-                </fail>
-                <condition property="has.crashed" >
-                                <resourcecontains resource="${output.file}" substring="Process crashed" />
-                </condition>
+		<!-- Possible values for test.size are small or large -->
+		<property name="test.size" value="small" />
+		<tstamp>
+			<format property="archive.name" pattern="'linphonetester_'yyyyMMdd_HHmmss" />
+		</tstamp>
+		<echo>Adb log files are put in ${archive.name}.zip</echo>
+		<exec executable="adb" >
+			<arg value="logcat" />
+			<arg value="-c" />
+		</exec>
+		<exec executable="./adb-log-start.sh" >
+			<arg value=" ${archive.name}" />
+		</exec>
+		<exec executable="bash">
+			<arg value="-c"/>
+			<!-- use 'tee' command to write in file AND on stdout.
+			First is used below to check if tests failed or not while second
+			is used to get output in real time -->
+			<arg value="adb shell am instrument -r -w -e size ${test.size} org.linphone.test/com.zutubi.android.junitreport.JUnitReportTestRunner | tee ${output.file}"/>
+		</exec>
+		<exec executable="bash" >
+			<arg value="-c" />
+			<arg value="kill `cat adb.pid`" />
+		</exec>
+		<exec executable="bash">
+			<arg value="-c"/>
+			<arg value="adb shell run-as org.linphone cat /data/data/org.linphone/files/junit-report.xml > linphone-junit-report-${test.size}.xml"/>
+		</exec>
+		<zip destfile="${archive.name}.zip">
+			<fileset dir="." includes="${archive.name}"/>
+		</zip>
+		<fail message="Tests failed">
+			<condition>
+				<resourcecontains resource="${output.file}" substring="FAILURES" />
+			</condition>
+		</fail>
+		<condition property="has.crashed" >
+			<resourcecontains resource="${output.file}" substring="Process crashed" />
+		</condition>
 
 		<antcall target="check-for-crash"/>
-                <delete file="${archive.name}"/>
-                <delete file="${output.file}"/>
-        </target>
-        <target name="check-for-crash" if="has.crashed">
-                <exec executable="bash" >
-                        <arg value="-c" />
-                        <arg value="tail -n 500 ${archive.name}" />
-                </exec>
-                <exec executable="bash" >
-                        <arg value="-c" />
-                        <arg value="cat ${archive.name} |ndk-stack -sym obj/local/`adb shell getprop ro.product.cpu.abi | tr -d '\r'`" />
-                </exec>
-                <fail message="Tests crashed"/>
-        </target>
+		<delete file="${archive.name}"/>
+		<delete file="${output.file}"/>
+	</target>
+	<target name="check-for-crash" if="has.crashed">
+		<exec executable="bash" >
+			<arg value="-c" />
+			<arg value="tail -n 500 ${archive.name}" />
+		</exec>
+		<exec executable="bash" >
+			<arg value="-c" />
+			<arg value="cat ${archive.name} |ndk-stack -sym obj/local/`adb shell getprop ro.product.cpu.abi | tr -d '\r'`" />
+		</exec>
+		<fail message="Tests crashed"/>
+	</target>
 </project>