diff --git a/components/VcItemContent.tsx b/components/VcItemContent.tsx
index 09b48652..4b745ca6 100644
--- a/components/VcItemContent.tsx
+++ b/components/VcItemContent.tsx
@@ -8,6 +8,7 @@ import VerifiedIcon from './VerifiedIcon';
 import {Column, Row, Text} from './ui';
 import {Theme} from './ui/styleUtils';
 import {CheckBox, Icon} from 'react-native-elements';
+import testIDProps from '../shared/commonUtil';
 
 const getDetails = (arg1, arg2, verifiableCredential) => {
   if (arg1 === 'Status') {
@@ -113,6 +114,7 @@ export const VcItemContent: React.FC<VcItemContentProps> = props => {
               style={Theme.Styles.closeCardImage}>
               {props.iconName && (
                 <Icon
+                  {...testIDProps('pinIcon')}
                   name={props.iconName}
                   type={props.iconType}
                   color={Theme.Colors.Icon}
diff --git a/screens/Home/MyVcs/BindingVcWarningOverlay.tsx b/screens/Home/MyVcs/BindingVcWarningOverlay.tsx
index 13f4a54e..b7033c24 100644
--- a/screens/Home/MyVcs/BindingVcWarningOverlay.tsx
+++ b/screens/Home/MyVcs/BindingVcWarningOverlay.tsx
@@ -1,14 +1,12 @@
 import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Dimensions, Image } from 'react-native';
-import { Overlay } from 'react-native-elements';
-import { Button, Column, Text, Row } from '../../../components/ui';
-import { Theme } from '../../../components/ui/styleUtils';
+import {useTranslation} from 'react-i18next';
+import {Dimensions, Image} from 'react-native';
+import {Overlay} from 'react-native-elements';
+import {Button, Column, Text, Row} from '../../../components/ui';
+import {Theme} from '../../../components/ui/styleUtils';
 
-export const BindingVcWarningOverlay: React.FC<QrLoginWarningProps> = (
-  props
-) => {
-  const { t } = useTranslation('BindingVcWarningOverlay');
+export const BindingVcWarningOverlay: React.FC<QrLoginWarningProps> = props => {
+  const {t} = useTranslation('BindingVcWarningOverlay');
 
   return (
     <Overlay
@@ -31,9 +29,12 @@ export const BindingVcWarningOverlay: React.FC<QrLoginWarningProps> = (
         </Row>
 
         <Column crossAlign="center" margin="0 0 30 0">
-          <Text weight="semibold">{t('alert')}</Text>
+          <Text testID="alert" weight="semibold">
+            {t('alert')}
+          </Text>
 
           <Text
+            testID="warningMsg"
             align="center"
             size="small"
             weight="semibold"
@@ -43,6 +44,7 @@ export const BindingVcWarningOverlay: React.FC<QrLoginWarningProps> = (
         </Column>
 
         <Button
+          testID="yesConfirm"
           margin={'30 0 0 0'}
           type="gradient"
           title={t('yesConfirm')}
@@ -50,6 +52,7 @@ export const BindingVcWarningOverlay: React.FC<QrLoginWarningProps> = (
         />
 
         <Button
+          testID="no"
           margin={'10 0 0 0'}
           type="clear"
           title={t('no')}
diff --git a/screens/Home/MyVcs/RemoveVcWarningOverlay.tsx b/screens/Home/MyVcs/RemoveVcWarningOverlay.tsx
index 451b527c..78823d73 100644
--- a/screens/Home/MyVcs/RemoveVcWarningOverlay.tsx
+++ b/screens/Home/MyVcs/RemoveVcWarningOverlay.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Dimensions, Image } from 'react-native';
-import { Overlay } from 'react-native-elements';
-import { Button, Column, Text, Row } from '../../../components/ui';
-import { Theme } from '../../../components/ui/styleUtils';
+import {useTranslation} from 'react-i18next';
+import {Dimensions, Image} from 'react-native';
+import {Overlay} from 'react-native-elements';
+import {Button, Column, Text, Row} from '../../../components/ui';
+import {Theme} from '../../../components/ui/styleUtils';
 
-export const RemoveVcWarningOverlay: React.FC<RemoveVcWarningOverlayProps> = (
-  props
-) => {
-  const { t } = useTranslation('RemoveVcWarningOverlay');
+export const RemoveVcWarningOverlay: React.FC<
+  RemoveVcWarningOverlayProps
+> = props => {
+  const {t} = useTranslation('RemoveVcWarningOverlay');
 
   return (
     <Overlay
@@ -31,9 +31,12 @@ export const RemoveVcWarningOverlay: React.FC<RemoveVcWarningOverlayProps> = (
         </Row>
 
         <Column crossAlign="center" margin="0 0 30 0">
-          <Text weight="semibold">{t('alert')}</Text>
+          <Text testID="alert" weight="semibold">
+            {t('alert')}
+          </Text>
 
           <Text
+            testID="warningMsg"
             align="center"
             size="small"
             weight="semibold"
@@ -43,6 +46,7 @@ export const RemoveVcWarningOverlay: React.FC<RemoveVcWarningOverlayProps> = (
         </Column>
 
         <Button
+          testID="yesConfirm"
           margin={'30 0 0 0'}
           type="gradient"
           title={t('confirm')}
@@ -50,6 +54,7 @@ export const RemoveVcWarningOverlay: React.FC<RemoveVcWarningOverlayProps> = (
         />
 
         <Button
+          testID="no"
           margin={'10 0 0 0'}
           type="clear"
           title={t('no')}