diff --git a/tests/.classpath b/tests/.classpath
index 8890c27cc..a9cbec67a 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -10,6 +10,6 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/linphone-android-private"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/linphone-android-bellesip"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/src/org/linphone/test/AccountManagement.java b/tests/src/org/linphone/test/AccountManagement.java
index 4b2611ac9..839eef18c 100644
--- a/tests/src/org/linphone/test/AccountManagement.java
+++ b/tests/src/org/linphone/test/AccountManagement.java
@@ -44,7 +44,7 @@ public class AccountManagement extends SampleTest {
 	public void testBDeleteAccount() {
 		goToSettings();
 		solo.clickOnText(iContext.getString(R.string.account_generic_login) + "new");
-		selectItemInListOnUIThread(7);
+		selectItemInListOnUIThread(8);
 		solo.clickLongOnText(aContext.getString(org.linphone.R.string.pref_delete_account));
 		
 		solo.goBack();
@@ -58,7 +58,7 @@ public class AccountManagement extends SampleTest {
 	public void testCDisableAccount() {
 		goToSettings();
 		solo.clickOnText(iContext.getString(R.string.account_linphone_login));
-		selectItemInListOnUIThread(5);
+		selectItemInListOnUIThread(6);
 		solo.clickLongOnText(aContext.getString(org.linphone.R.string.pref_disable_account));
 		
 		solo.goBack();
@@ -72,7 +72,7 @@ public class AccountManagement extends SampleTest {
 	public void testDEnableAccount() {
 		goToSettings();
 		solo.clickOnText(iContext.getString(R.string.account_linphone_login));
-		selectItemInListOnUIThread(5);
+		selectItemInListOnUIThread(6);
 		solo.clickLongOnText(aContext.getString(org.linphone.R.string.pref_disable_account));
 		
 		solo.goBack();
diff --git a/tests/src/org/linphone/test/Chat.java b/tests/src/org/linphone/test/Chat.java
index 35954c728..8d4301e59 100644
--- a/tests/src/org/linphone/test/Chat.java
+++ b/tests/src/org/linphone/test/Chat.java
@@ -55,7 +55,7 @@ public class Chat extends SampleTest {
 		goToChat();
 		solo.clickOnText(iContext.getString(org.linphone.test.R.string.account_test_calls_login));
 		
-		LinphoneChatRoom chatRoom = LinphoneTestManager.getLc().createChatRoom("sip:" + iContext.getString(R.string.account_linphone_login) + "@" + iContext.getString(R.string.account_linphone_domain));
+		LinphoneChatRoom chatRoom = LinphoneTestManager.getLc().getOrCreateChatRoom("sip:" + iContext.getString(R.string.account_linphone_login) + "@" + iContext.getString(R.string.account_linphone_domain));
 		LinphoneChatMessage msg = chatRoom.createLinphoneChatMessage(iContext.getString(R.string.chat_test_text_received));
 		chatRoom.sendMessage(msg, new LinphoneChatMessage.StateListener() {
 			@Override