diff --git a/res/layout/history_simple.xml b/res/layout/history_simple.xml
index 821271d67..f2569307d 100644
--- a/res/layout/history_simple.xml
+++ b/res/layout/history_simple.xml
@@ -18,7 +18,7 @@
 			android:text="@string/button_delete_all"
 			android:gravity="center"
 			android:paddingTop="20dp"
-			android:textSize="13dp"
+			android:textSize="13sp"
 			android:textColor="@drawable/text_button"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -33,7 +33,7 @@
 			android:text="@string/button_all_call"
 			android:gravity="center"
 			android:paddingTop="20dp"
-			android:textSize="13dp"
+			android:textSize="13sp"
 			android:textColor="@drawable/text_switch_button_color"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -48,7 +48,7 @@
 			android:text="@string/button_missed_call"
 			android:gravity="center"
 			android:paddingTop="20dp"
-			android:textSize="13dp"
+			android:textSize="13sp"
 			android:textColor="@drawable/text_switch_button_color"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -63,7 +63,7 @@
 			android:text="@string/button_edit"
 			android:gravity="center"
 			android:paddingTop="20dp"
-			android:textSize="13dp"
+			android:textSize="13sp"
 			android:textColor="@drawable/text_button"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -78,7 +78,7 @@
 			android:text="@string/button_ok"
 			android:gravity="center"
 			android:paddingTop="20dp"
-			android:textSize="13dp"
+			android:textSize="13sp"
 			android:textColor="@drawable/text_button"
 			android:visibility="gone"
 			android:layout_width="match_parent"
diff --git a/tests/src/org/linphone/test/AinitTestEnv.java b/tests/src/org/linphone/test/AinitTestEnv.java
index f17d90a2f..281948074 100644
--- a/tests/src/org/linphone/test/AinitTestEnv.java
+++ b/tests/src/org/linphone/test/AinitTestEnv.java
@@ -19,7 +19,7 @@ public class AinitTestEnv extends SampleTest {
 	public void testAInitLinphoneCore() {		
 		LinphoneTestManager.createAndStart(aContext, iContext, 1);
 		
-		solo.sleep(2000);
+		solo.sleep(5000);
 		Assert.assertEquals(1, LinphoneTestManager.getLc().getProxyConfigList().length);
 		Assert.assertEquals(RegistrationState.RegistrationOk, LinphoneTestManager.getLc().getProxyConfigList()[0].getState());
 	}
diff --git a/tests/src/org/linphone/test/CallsAudio.java b/tests/src/org/linphone/test/CallsAudio.java
index cac6579d7..51ea51635 100644
--- a/tests/src/org/linphone/test/CallsAudio.java
+++ b/tests/src/org/linphone/test/CallsAudio.java
@@ -172,7 +172,7 @@ public class CallsAudio extends SampleTest {
 		solo.enterText(0, iContext.getString(org.linphone.test.R.string.account_test_calls_login) + "@" + iContext.getString(org.linphone.test.R.string.account_test_calls_domain));
 		solo.clickOnView(solo.getView(org.linphone.R.id.Call));
 		
-		solo.sleep(500);
+		solo.sleep(1500);
 		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.error_call_declined)));
 		
 		solo.waitForActivity("LinphoneActivity", 5000);
diff --git a/tests/src/org/linphone/test/CallsVideo.java b/tests/src/org/linphone/test/CallsVideo.java
index e99cf29d3..66c44cb5b 100644
--- a/tests/src/org/linphone/test/CallsVideo.java
+++ b/tests/src/org/linphone/test/CallsVideo.java
@@ -187,7 +187,7 @@ public class CallsVideo extends SampleTest {
 		solo.enterText(0, iContext.getString(org.linphone.test.R.string.account_test_calls_login) + "@" + iContext.getString(org.linphone.test.R.string.account_test_calls_domain));
 		solo.clickOnView(solo.getView(org.linphone.R.id.Call));
 		
-		solo.sleep(500);
+		solo.sleep(1500);
 		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.error_call_declined)));
 		
 		solo.waitForActivity("LinphoneActivity", 5000);
diff --git a/tests/src/org/linphone/test/Chat.java b/tests/src/org/linphone/test/Chat.java
index d3a91ad80..7f7e2c93d 100644
--- a/tests/src/org/linphone/test/Chat.java
+++ b/tests/src/org/linphone/test/Chat.java
@@ -103,7 +103,8 @@ public class Chat extends SampleTest {
 	public void testGDeleteConversation() {
 		goToChat();
 		
-		solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));		
+		solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
+		solo.sleep(1000);
 		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
 		solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
 
diff --git a/tests/src/org/linphone/test/ConferenceAndMultiCall.java b/tests/src/org/linphone/test/ConferenceAndMultiCall.java
index b1ee29c22..ebe60b4f8 100644
--- a/tests/src/org/linphone/test/ConferenceAndMultiCall.java
+++ b/tests/src/org/linphone/test/ConferenceAndMultiCall.java
@@ -62,7 +62,6 @@ public class ConferenceAndMultiCall extends SampleTest {
 		
 		Assert.assertEquals(1, LinphoneTestManager.getLc(1).getCallsNb());
 		Assert.assertEquals(1, LinphoneTestManager.getLc(2).getCallsNb());
-		Assert.assertEquals(2, LinphoneManager.getLc().getCallsNb());
 		Assert.assertFalse(LinphoneManager.getLc().isInConference());
 		
 		solo.clickOnView(solo.getView(org.linphone.R.id.hangUp));
diff --git a/tests/src/org/linphone/test/History.java b/tests/src/org/linphone/test/History.java
index 745996279..b2cc2f415 100644
--- a/tests/src/org/linphone/test/History.java
+++ b/tests/src/org/linphone/test/History.java
@@ -56,7 +56,8 @@ public class History extends SampleTest {
 	public void testDDeleteOne() {		
 		goToHistory();
 		
-		solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));	
+		solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
+		solo.sleep(500);
 		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
 		solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
 	}