diff --git a/Riot/ViewController/AttachmentsViewController.m b/Riot/ViewController/AttachmentsViewController.m
index d40d86ead..00c676fa2 100644
--- a/Riot/ViewController/AttachmentsViewController.m
+++ b/Riot/ViewController/AttachmentsViewController.m
@@ -41,6 +41,8 @@
 {
     [super viewDidLoad];
     // Do any additional setup after loading the view, typically from a nib.
+    
+    self.attachmentsCollection.accessibilityIdentifier =@"AttachmentsVC";
 }
 
 - (void)viewWillAppear:(BOOL)animated
diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m
index d1563ac54..20f1029c8 100644
--- a/Riot/ViewController/SettingsViewController.m
+++ b/Riot/ViewController/SettingsViewController.m
@@ -1184,7 +1184,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
         cell.accessoryType = UITableViewCellAccessoryNone;
         cell.accessoryView = nil;
     }
-    
+    cell.textLabel.accessibilityIdentifier = nil;
     cell.textLabel.font = [UIFont systemFontOfSize:17];
     cell.textLabel.textColor = kRiotTextColorBlack;
     
@@ -1253,6 +1253,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
             }
             
             profileCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_profile_picture", @"Vector", nil);
+            profileCell.accessibilityIdentifier=@"SettingsVCProfilPictureStaticText";
             profileCell.mxkLabel.textColor = kRiotTextColorBlack;
             
             // if the user defines a new avatar
@@ -1577,7 +1578,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
         
         configCell.textLabel.text =[NSString stringWithFormat:configFormat, account.mxCredentials.userId, account.mxCredentials.homeServer, account.identityServerURL];
         configCell.textLabel.numberOfLines = 0;
-        
+        configCell.textLabel.accessibilityIdentifier=@"SettingsVCConfigStaticText";
         configCell.selectionStyle = UITableViewCellSelectionStyleNone;
         
         cell = configCell;