diff --git a/Makefile b/Makefile
index 4b2cec29c..dfa2c8a61 100644
--- a/Makefile
+++ b/Makefile
@@ -121,16 +121,20 @@ prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-sr
 
 LIBLINPHONE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH)
 
-generate-libs: prepare-sources
+generate-libs: prepare-sources javah
 	$(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS)
 
 update-project:
 	$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
+	$(SDK_PATH)/android update project --path liblinphone_tester --target $(ANDROID_MOST_RECENT_TARGET)
 
-liblinphone_tester: prepare-sources prepare-cunit prepare-liblinphone_tester
+liblinphone_tester: prepare-sources prepare-cunit prepare-liblinphone_tester javah
 	$(NDK_PATH)/ndk-build -C liblinphone_tester $(LIBLINPHONE_OPTIONS) NDK_DEBUG=1 -j$(NUMCPUS)
 
-generate-apk:
+javah: 
+	ant javah
+
+generate-apk: generate-libs
 	ant partial-clean
 	echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties
 	ant debug
@@ -141,7 +145,7 @@ install-apk:
 release: update-project
 	ant clean
 	echo "What is the version name for the release ?"; \
-    read version; \
+	read version; \
 	echo "version.name=$$version" > default.properties
 	ant release
 
diff --git a/custom_rules.xml b/custom_rules.xml
index fdecf9fbb..5ddacc5b0 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -17,7 +17,7 @@
 			failonerror="false" />
 	</target>
 
-	<target name="javah">
+	<target name="javah" depends="-set-debug-mode,-compile">
 		<echo level="info">Generate JNI header</echo>
 		<javah outputfile="gen/linphonecore_jni.h">
 			<classpath>
@@ -56,15 +56,6 @@
 	    <delete file="bin/${ant.project.name}.ap_" />
 	</target>
 
-	<target name="build-libs">
-		<exec executable="make" failonerror="true">
-			<arg value="generate-libs" />
-		</exec>
-	</target>
-
-	<target name="-post-compile" depends="javah, build-libs">
-	</target>
-
 	<target name="javadoc">
 		<echo level="info">Generate Javadoc</echo>
 		<javadoc 
diff --git a/liblinphone_tester/ant.properties b/liblinphone_tester/ant.properties
new file mode 100644
index 000000000..9c05ba1c8
--- /dev/null
+++ b/liblinphone_tester/ant.properties
@@ -0,0 +1 @@
+source.dir=src:../submodules/linphone/mediastreamer2/java/src
diff --git a/liblinphone_tester/src/org/linphone/tester/TestRunner.java b/liblinphone_tester/src/org/linphone/tester/TestRunner.java
index ab928c6b1..cfa36f636 100644
--- a/liblinphone_tester/src/org/linphone/tester/TestRunner.java
+++ b/liblinphone_tester/src/org/linphone/tester/TestRunner.java
@@ -23,7 +23,6 @@ public class TestRunner extends InstrumentationTestRunner {
 		return suite;
 	}
 	
-	
 	public static void addSuites(TestSuite suite, String suiteCheck, String testCheck) {
 		TesterList testerList = new TesterList();
 		testerList.run(new String[]{"tester", "--list-suites"});
@@ -34,6 +33,7 @@ public class TestRunner extends InstrumentationTestRunner {
 			}
 		}
 	}
+	
 	public static void addSuite(TestSuite suite, String suiteStr, String testCheck) {
 		TesterList testerList = new TesterList();
 		testerList.run(new String[]{"tester", "--list-tests", suiteStr});