diff --git a/liblinphone_tester/res/raw/cpim_grammar b/liblinphone_tester/res/raw/cpim_grammar
new file mode 100644
index 000000000..6f8b36d95
Binary files /dev/null and b/liblinphone_tester/res/raw/cpim_grammar differ
diff --git a/liblinphone_tester/res/raw/vcard_grammar b/liblinphone_tester/res/raw/vcard_grammar
new file mode 100644
index 000000000..48ceb8e37
Binary files /dev/null and b/liblinphone_tester/res/raw/vcard_grammar differ
diff --git a/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java b/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java
index dd1ca2224..678893a9c 100644
--- a/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java
+++ b/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java
@@ -2,6 +2,7 @@ package org.linphone.tester;
 
 import android.os.Bundle;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.view.Gravity;
 import android.view.Menu;
@@ -19,6 +20,7 @@ public class SuitesActivity extends Activity {
 		if (extras != null) {
 			mSuite = extras.getString("suite");
 		    if(mSuite != null) {
+			    Tester.setApplicationContext(getBaseContext());
 		    	this.setTitle(this.getResources().getString(R.string.app_name) + " | " + mSuite);
 				TesterList suitesTest = new TesterList();
 				suitesTest.run(new String[]{"tester", "--list-tests", mSuite});
@@ -59,6 +61,11 @@ public class SuitesActivity extends Activity {
 	}
 
 
+	@Override
+	public void onDestroy() {
+		Tester.removeApplicationContext();
+		super.onDestroy();
+	}
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java
index 603036e95..8c3827a7b 100644
--- a/liblinphone_tester/src/org/linphone/tester/Tester.java
+++ b/liblinphone_tester/src/org/linphone/tester/Tester.java
@@ -6,6 +6,7 @@ import org.linphone.core.Factory;
 import org.linphone.mediastream.Version;
 
 import android.util.Log;
+import android.content.Context;
 
 public class Tester {
 	public static String TAG = "liblinphone-tester";
@@ -49,6 +50,8 @@ public class Tester {
 		}
 	}
 
+	public static native void setApplicationContext(Context ct);
+	public static native void removeApplicationContext();
 	public native int run(String args[]);
 	public static native void keepAccounts(boolean keep);
 	public static native void clearAccounts();
diff --git a/prepare.py b/prepare.py
index d42cf4b03..b32646701 100755
--- a/prepare.py
+++ b/prepare.py
@@ -241,6 +241,7 @@ install: install-apk run-linphone
 install-test:
 \t$(MAKE) -C liblinphone_tester copy-libs
 \t$(MAKE) -C liblinphone_tester copy-files
+\t./gradlew -b liblinphone_tester/build.gradle clean
 \t./gradlew -b liblinphone_tester/build.gradle assembleDebug
 \t./gradlew -b liblinphone_tester/build.gradle installDebug