diff --git a/Session/Calls/CallVC.swift b/Session/Calls/CallVC.swift
index bef6a7242..3d16edf22 100644
--- a/Session/Calls/CallVC.swift
+++ b/Session/Calls/CallVC.swift
@@ -172,6 +172,8 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
     
     private lazy var answerButton: UIButton = {
         let result = UIButton(type: .custom)
+        result.accessibilityIdentifier = "Answer call"
+        result.accessibilityLabel = "Answer call"
         result.setImage(
             UIImage(named: "AnswerCall")?
                 .withRenderingMode(.alwaysTemplate),
diff --git a/Session/Conversations/Message Cells/CallMessageCell.swift b/Session/Conversations/Message Cells/CallMessageCell.swift
index ae3d44ff1..0d2fe20c1 100644
--- a/Session/Conversations/Message Cells/CallMessageCell.swift	
+++ b/Session/Conversations/Message Cells/CallMessageCell.swift	
@@ -138,6 +138,8 @@ final class CallMessageCell: MessageCell {
             )
         else { return }
         
+        self.accessibilityIdentifier = "Control message"
+        self.isAccessibilityElement = true
         self.viewModel = cellViewModel
         self.topConstraint.constant = (cellViewModel.shouldShowDateHeader ? 0 : CallMessageCell.inset)