diff --git a/liblinphone_tester/src/org/linphone/tester/MainActivity.java b/liblinphone_tester/src/org/linphone/tester/MainActivity.java
index 2d868eaf8..0c64e6ef5 100644
--- a/liblinphone_tester/src/org/linphone/tester/MainActivity.java
+++ b/liblinphone_tester/src/org/linphone/tester/MainActivity.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.Override;
 
 import android.os.Bundle;
 import android.app.Activity;
@@ -29,6 +30,7 @@ public class MainActivity extends Activity {
 		} catch (IOException e) {
 			Log.e("liblinphone_tester", "Cannot install rc files",e);
 		}
+		Tester.keepAccounts(true);
 		TesterList suitesTest = new TesterList();
 		suitesTest.run(new String[]{"tester", "--list-suites"});
 		LinearLayout layout = ((LinearLayout)findViewById(R.id.suites_list));
@@ -39,6 +41,13 @@ public class MainActivity extends Activity {
 			addButton(layout, str, str);
 		}
 	}
+
+	@Override
+	protected void onDestroy(){
+		Tester.clearAccounts();
+		super.onDestroy();
+	}
+
 	private void addButton(LinearLayout layout, String text, String data) {
 		Button button = new Button(this);
 		button.setText(text);
@@ -46,17 +55,17 @@ public class MainActivity extends Activity {
 		button.setGravity(Gravity.CENTER);
 		button.setOnClickListener(new Button.OnClickListener() {
 		    public void onClick(View v) {
-		    	Button button = (Button) v;
-		    	String data = (String)button.getTag();
-		    	if(data == null) {
-		    		Intent intent = new Intent(getBaseContext(), LogsActivity.class);
-		    		intent.putExtra("args", new String[]{});
-		    		startActivity(intent);
-		    	} else {
-		    		Intent intent = new Intent(getBaseContext(), SuitesActivity.class);
-		    		intent.putExtra("suite", data);
-		    		startActivity(intent);
-		    	}
+		 		Button button = (Button) v;
+		 		String data = (String)button.getTag();
+		 		if(data == null) {
+		 			Intent intent = new Intent(getBaseContext(), LogsActivity.class);
+		 			intent.putExtra("args", new String[]{});
+		 			startActivity(intent);
+		 		} else {
+		 			Intent intent = new Intent(getBaseContext(), SuitesActivity.class);
+		 			intent.putExtra("suite", data);
+		 			startActivity(intent);
+		 		}
 		    }
 		});
 		layout.addView(button);
diff --git a/liblinphone_tester/src/org/linphone/tester/TestRunner.java b/liblinphone_tester/src/org/linphone/tester/TestRunner.java
index d45675e5a..8de7dd969 100644
--- a/liblinphone_tester/src/org/linphone/tester/TestRunner.java
+++ b/liblinphone_tester/src/org/linphone/tester/TestRunner.java
@@ -5,6 +5,8 @@ import android.os.Bundle;
 
 import com.zutubi.android.junitreport.JUnitReportTestRunner;
 
+import java.lang.Override;
+
 
 public class TestRunner extends JUnitReportTestRunner {
 	String mSuite = null;
@@ -14,9 +16,16 @@ public class TestRunner extends JUnitReportTestRunner {
 	public void onCreate(Bundle arguments) {
 		mSuite = arguments.getString("suite");
 		mTest = arguments.getString("test");
+		Tester.keepAccounts(true);
 		
 		super.onCreate(arguments);
 	}
+
+	@Override
+	public void onDestroy() {
+		Tester.clearAccounts();
+		super.onDestroy();
+	}
 	
 	@Override
 	public TestSuite getAllTests () {
diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java
index 83f1a5fb6..b01b73d79 100644
--- a/liblinphone_tester/src/org/linphone/tester/Tester.java
+++ b/liblinphone_tester/src/org/linphone/tester/Tester.java
@@ -45,6 +45,8 @@ public class Tester {
 	}
 	
 	public native int run(String args[]);
+	public static native void keepAccounts(boolean keep);
+	public static native void clearAccounts();
 	
 	public void printLog(final int level, final String message) {
 		switch(level) {
diff --git a/submodules/linphone b/submodules/linphone
index 23f950a73..582419948 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 23f950a73fe9bacd00e934fddfe40cd7acf970a9
+Subproject commit 5824199483fbd4ff62d92722cd2c5175e41e7888