diff --git a/tests/src/org/linphone/test/Contacts.java b/tests/src/org/linphone/test/Contacts.java
index 3b1448815..16a944c17 100644
--- a/tests/src/org/linphone/test/Contacts.java
+++ b/tests/src/org/linphone/test/Contacts.java
@@ -29,15 +29,15 @@ public class Contacts extends SampleTest {
 		Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.account_test_calls_login) + "@" + iContext.getString(org.linphone.test.R.string.account_test_calls_domain)));
 		
 		solo.enterText(0, iContext.getString(org.linphone.test.R.string.contact_name));
-		solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
-		
+		solo.clickOnView(solo.getView(org.linphone.R.id.ok));
+
 		Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
 		
 		solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
-		solo.clickOnText(aContext.getString(org.linphone.R.string.delete_contact));
+		solo.clickOnView(solo.getView(org.linphone.R.id.delete_contact));
 		solo.sleep(1000);
-		solo.clickOnText(aContext.getString(R.string.button_ok));
-		
+		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
+
 		Assert.assertFalse(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
 	}
 
@@ -103,7 +103,7 @@ public class Contacts extends SampleTest {
 
 		solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
 		solo.clickOnView(solo.getView(org.linphone.R.id.contact_chat));
-		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.button_send_message)));
+		//Assert.assertTrue(solo.search(aContext.get(org.linphone.R.string.send_message)));
 	}
 
 	@SmallTest
@@ -115,7 +115,7 @@ public class Contacts extends SampleTest {
 		solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
 		solo.clickOnView(solo.getView(org.linphone.R.id.deleteContact));
 		solo.sleep(1000);
-		solo.clickOnText(aContext.getString(R.string.button_ok));
+		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
 		Assert.assertFalse(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
 	}
 	
diff --git a/tests/src/org/linphone/test/History.java b/tests/src/org/linphone/test/History.java
index a33d357a7..45712cbd0 100644
--- a/tests/src/org/linphone/test/History.java
+++ b/tests/src/org/linphone/test/History.java
@@ -29,8 +29,8 @@ public class History extends SampleTest {
 	@LargeTest
 	public void testBFilterMissedCalls() {		
 		goToHistory();
-		
-		solo.clickOnText(aContext.getString(org.linphone.R.string.button_missed_call));
+
+		solo.clickOnView(solo.getView(org.linphone.R.id.missed_calls));
 		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.no_missed_call_history)));
 	}
 	
@@ -55,11 +55,11 @@ public class History extends SampleTest {
 	@LargeTest
 	public void testDDeleteOne() {		
 		goToHistory();
-		
-		solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
+
+		solo.clickOnView(solo.getView(org.linphone.R.id.edit));
 		solo.sleep(500);
 		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
-		solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
+		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
 	}
 
 	@SmallTest
@@ -71,7 +71,7 @@ public class History extends SampleTest {
 		solo.clickOnView(solo.getView(org.linphone.R.id.edit));
 		solo.clickOnView(solo.getView(org.linphone.R.id.select_all));
 		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
-		solo.clickOnText(aContext.getString(org.linphone.R.string.button_ok));
+		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
 
 		Assert.assertTrue(solo.searchText(aContext.getString(org.linphone.R.string.no_call_history)));
 	}