diff --git a/Classes/Base.lproj/ChatRoomViewController.xib b/Classes/Base.lproj/ChatRoomViewController.xib
index d80a70a26..9e0649197 100644
--- a/Classes/Base.lproj/ChatRoomViewController.xib
+++ b/Classes/Base.lproj/ChatRoomViewController.xib
@@ -47,7 +47,7 @@
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="avatar_unknown_small.png" id="41" userLabel="avatarImage">
                                     <rect key="frame" x="20" y="6" width="65" height="65"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                                    <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                         <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                         <bool key="isElement" value="YES"/>
                                     </accessibility>
@@ -55,7 +55,7 @@
                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Contact1" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="40" userLabel="addressLabel">
                                     <rect key="frame" x="101" y="37" width="199" height="43"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact's name">
+                                    <accessibility key="accessibilityConfiguration" label="Contact name">
                                         <accessibilityTraits key="traits" none="YES"/>
                                     </accessibility>
                                     <fontDescription key="fontDescription" type="system" pointSize="22"/>
diff --git a/Classes/Base.lproj/HistoryDetailsViewController.xib b/Classes/Base.lproj/HistoryDetailsViewController.xib
index 3f0d28f4e..05a1ac272 100644
--- a/Classes/Base.lproj/HistoryDetailsViewController.xib
+++ b/Classes/Base.lproj/HistoryDetailsViewController.xib
@@ -102,7 +102,7 @@
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="avatar_unknown_small.png" id="23" userLabel="avatarImage">
                             <rect key="frame" x="20" y="6" width="65" height="65"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                 <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                 <bool key="isElement" value="YES"/>
                             </accessibility>
@@ -110,7 +110,7 @@
                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Contact1" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="25" userLabel="addressLabel">
                             <rect key="frame" x="101" y="37" width="192" height="43"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="22"/>
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
diff --git a/Classes/Base.lproj/IncomingCallViewController.xib b/Classes/Base.lproj/IncomingCallViewController.xib
index b7bf28ba6..70078f290 100644
--- a/Classes/Base.lproj/IncomingCallViewController.xib
+++ b/Classes/Base.lproj/IncomingCallViewController.xib
@@ -44,7 +44,7 @@
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="9" userLabel="addressLabel">
                             <rect key="frame" x="10" y="53" width="300" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
                             <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
                             <nil key="highlightedColor"/>
@@ -56,7 +56,7 @@
                         <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" image="avatar_unknown.png" id="19" userLabel="avatarImage">
                             <rect key="frame" x="80" y="113" width="160" height="170"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                 <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                 <bool key="isElement" value="YES"/>
                             </accessibility>
diff --git a/Classes/Base.lproj/IncomingCallViewController~ipad.xib b/Classes/Base.lproj/IncomingCallViewController~ipad.xib
index 59ff64f58..d296c73bb 100644
--- a/Classes/Base.lproj/IncomingCallViewController~ipad.xib
+++ b/Classes/Base.lproj/IncomingCallViewController~ipad.xib
@@ -45,7 +45,7 @@
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="9" userLabel="addressLabel">
                             <rect key="frame" x="10" y="53" width="748" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
                             <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
                             <nil key="highlightedColor"/>
@@ -57,7 +57,7 @@
                         <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" image="avatar_unknown.png" id="19" userLabel="avatarImage">
                             <rect key="frame" x="304" y="113" width="160" height="170"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                 <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                 <bool key="isElement" value="YES"/>
                             </accessibility>
@@ -136,7 +136,7 @@
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="69" userLabel="addressLabel">
                             <rect key="frame" x="10" y="53" width="1004" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
                             <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
                             <nil key="highlightedColor"/>
@@ -148,7 +148,7 @@
                         <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" image="avatar_unknown.png" id="71" userLabel="avatarImage">
                             <rect key="frame" x="432" y="113" width="160" height="170"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                 <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                 <bool key="isElement" value="YES"/>
                             </accessibility>
diff --git a/Classes/ChatRoomTableViewController.m b/Classes/ChatRoomTableViewController.m
index ef8bf5307..2780d723f 100644
--- a/Classes/ChatRoomTableViewController.m
+++ b/Classes/ChatRoomTableViewController.m
@@ -48,6 +48,7 @@
 }
 - (void)viewWillAppear:(BOOL)animated {
 	[super viewWillAppear:animated];
+    self.tableView.accessibilityIdentifier = @"Chat list";
 	[self reloadData];
 }
 
diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index 480d99e11..458aa7e01 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -298,6 +298,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		ms_free(address);
     }
     [addressLabel setText:displayName];
+    [addressLabel setAccessibilityValue:displayName];
 
     // Avatar
     if(image == nil) {
diff --git a/Classes/LinphoneUI/Base.lproj/UICallCell.xib b/Classes/LinphoneUI/Base.lproj/UICallCell.xib
index fc7757b12..c46edde08 100644
--- a/Classes/LinphoneUI/Base.lproj/UICallCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UICallCell.xib
@@ -59,7 +59,7 @@
                                     <rect key="frame" x="80" y="0.0" width="160" height="170"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                                    <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                         <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                         <bool key="isElement" value="YES"/>
                                     </accessibility>
@@ -364,7 +364,7 @@
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="17" userLabel="addressLabel">
                             <rect key="frame" x="95" y="0.0" width="125" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name">
+                            <accessibility key="accessibilityConfiguration" label="Contact name">
                                 <accessibilityTraits key="traits" none="YES"/>
                             </accessibility>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib
index e525d95a6..e4a9593a5 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib
@@ -87,6 +87,7 @@
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="18" userLabel="deleteButton">
                             <rect key="frame" x="250" y="0.0" width="44" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                            <accessibility key="accessibilityConfiguration" label="Delete message"/>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                             <inset key="imageEdgeInsets" minX="20" minY="2" maxX="2" maxY="20"/>
                             <state key="normal" image="list_delete_default.png">
diff --git a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.xib
index 97ae47c35..f4934c521 100644
--- a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.xib
@@ -31,7 +31,7 @@
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="22" userLabel="avatarButton">
                     <rect key="frame" x="20" y="6" width="65" height="65"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                    <accessibility key="accessibilityConfiguration" label="Contact avatar">
                         <accessibilityTraits key="traits" none="YES"/>
                     </accessibility>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
@@ -53,7 +53,7 @@
                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Contact1" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="8" userLabel="addressLabel">
                             <rect key="frame" x="0.0" y="37" width="199" height="43"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="22"/>
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
diff --git a/KifTests/ChatTester.m b/KifTests/ChatTester.m
index 7640c2171..66e200519 100644
--- a/KifTests/ChatTester.m
+++ b/KifTests/ChatTester.m
@@ -11,6 +11,8 @@
 @implementation ChatTester
 
 
+#pragma mark - setup
+
 - (void)beforeAll {
     [super beforeAll];
     [self switchToValidAccountIfNeeded];
@@ -18,20 +20,83 @@
     [tester tapViewWithAccessibilityLabel:@"Chat"];
 }
 
-- (void)testSendMessageToMyself {
-    [tester enterText:[self accountUsername] intoViewWithAccessibilityLabel:@"Enter a address"];
+#pragma mark - tools
+
+- (void)goBackFromChat {
+    [tester tapViewWithAccessibilityLabel:@"Back"];
+}
+
+- (void)startChatWith:(NSString*)user {
+    [tester enterText:user intoViewWithAccessibilityLabel:@"Enter a address"];
     [tester tapViewWithAccessibilityLabel:@"New Discussion"];
-    
-    [tester enterText:@"Hello" intoViewWithAccessibilityLabel:@"Message field"];
-    
+}
+
+- (void)sendMessage:(NSString*)message {
+    [tester enterText:message intoViewWithAccessibilityLabel:@"Message field"];
     [tester tapViewWithAccessibilityLabel:@"Send"];
+}
+
+
+#pragma mark - tests
+
+- (void)testSendMessageToMyself {
+    [self startChatWith:[self accountUsername]];
+    
+    [self sendMessage:@"Hello"];
     
     [tester waitForViewWithAccessibilityLabel:@"Outgoing message" value:@"Hello" traits:UIAccessibilityTraitStaticText];
     [tester waitForViewWithAccessibilityLabel:@"Incoming message" value:@"Hello" traits:UIAccessibilityTraitStaticText];
     
     [tester waitForViewWithAccessibilityLabel:@"Message status" value:@"delivered" traits:UIAccessibilityTraitImage];
     
-    [tester tapViewWithAccessibilityLabel:@"Back"];    
+    [self goBackFromChat];
 }
 
+- (void)testInvalidSPAddress {
+    
+    [self startChatWith:@"sip://toto"];
+    
+    [tester waitForViewWithAccessibilityLabel:@"Invalid address" traits:UIAccessibilityTraitStaticText];
+    [tester tapViewWithAccessibilityLabel:@"Cancel"];
+}
+
+-(void)testSendToSIPAddress{
+    NSString* sipAddr = [NSString stringWithFormat:@"sip:%@@%@", [self accountUsername], [self accountDomain]];
+    
+    [self startChatWith:sipAddr];
+    
+    [tester waitForViewWithAccessibilityLabel:@"Contact name" value:@"testios" traits:0];
+    
+    [self goBackFromChat];
+}
+
+- (void)testChatMessageRemoval {
+    
+    NSString* user = [self getUUID];
+    
+    [self startChatWith:user];
+    [self sendMessage:@"Hello Bro"];
+    
+    [tester tapViewWithAccessibilityLabel:@"Edit" traits:UIAccessibilityTraitButton];
+    
+    [tester tapViewWithAccessibilityLabel:@"Delete message"];
+    
+    [tester tapViewWithAccessibilityLabel:@"Edit" traits:UIAccessibilityTraitButton];
+    
+
+   
+    // check that the tableview is empty
+    UITableView* tv = nil;
+    NSError*    err = nil;
+    if( [tester tryFindingAccessibilityElement:nil view:&tv withIdentifier:@"Chat list" tappable:false error:&err] ){
+        XCTAssert(tv != nil);
+        XCTAssert([tv numberOfRowsInSection:0] == 0); // no more messages
+    } else {
+        NSLog(@"Error: %@",err);
+    }
+    
+    [self goBackFromChat];
+}
+
+
 @end
diff --git a/KifTests/LinphoneTestCase.h b/KifTests/LinphoneTestCase.h
index c1d3d290e..1417de9ce 100644
--- a/KifTests/LinphoneTestCase.h
+++ b/KifTests/LinphoneTestCase.h
@@ -15,5 +15,6 @@
 - (NSString*)accountUsername;
 - (NSString*)accountDomain;
 
+- (NSString*)getUUID;
 
 @end
diff --git a/KifTests/LinphoneTestCase.m b/KifTests/LinphoneTestCase.m
index d11dbd712..1152db7cc 100644
--- a/KifTests/LinphoneTestCase.m
+++ b/KifTests/LinphoneTestCase.m
@@ -21,6 +21,11 @@
 - (NSString *)accountDomain {
     return @"sip.linphone.org";
 }
+
+- (NSString*)getUUID {
+    return [[NSUUID UUID] UUIDString];
+}
+
 - (void)beforeAll{
     [tester acknowledgeSystemAlert];
     [super beforeAll];
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 0a7ffbe6b..f11c62105 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -4457,6 +4457,7 @@
 					HAVE_SSL,
 					DEBUG,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
@@ -4539,6 +4540,7 @@
 					HAVE_SILK,
 					HAVE_SSL,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
@@ -4620,6 +4622,7 @@
 					HAVE_SILK,
 					HAVE_SSL,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
@@ -4702,6 +4705,7 @@
 					HAVE_SILK,
 					HAVE_SSL,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
@@ -5190,6 +5194,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -5202,6 +5207,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"\"${PODS_ROOT}/Headers/Public\"",
+					"\"${PODS_ROOT}/Headers/Public/KIF\"",
+					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
+				);
 				INFOPLIST_FILE = KifTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -5228,11 +5238,17 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"\"${PODS_ROOT}/Headers/Public\"",
+					"\"${PODS_ROOT}/Headers/Public/KIF\"",
+					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
+				);
 				INFOPLIST_FILE = KifTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -5260,11 +5276,17 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"\"${PODS_ROOT}/Headers/Public\"",
+					"\"${PODS_ROOT}/Headers/Public/KIF\"",
+					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
+				);
 				INFOPLIST_FILE = KifTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -5292,11 +5314,17 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"\"${PODS_ROOT}/Headers/Public\"",
+					"\"${PODS_ROOT}/Headers/Public/KIF\"",
+					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
+				);
 				INFOPLIST_FILE = KifTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";