diff --git a/features/admin.branding.ai.v1/components/branding-ai-banner.tsx b/features/admin.branding.ai.v1/components/branding-ai-banner.tsx
index d765e7dd809..e6c929b4ae5 100644
--- a/features/admin.branding.ai.v1/components/branding-ai-banner.tsx
+++ b/features/admin.branding.ai.v1/components/branding-ai-banner.tsx
@@ -125,6 +125,7 @@ const BrandingAIBanner: FunctionComponent = (): ReactElement => {
                     <TextField
                         name="brandingAIInput"
                         className="branding-ai-input-field mt-5"
+                        data-componentid="branding-ai-input-field"
                         placeholder={ t("branding:ai.banner.input.placeholder") }
                         fullWidth
                         inputProps={ {
diff --git a/features/admin.login-flow.ai.v1/components/login-flow-ai-banner.tsx b/features/admin.login-flow.ai.v1/components/login-flow-ai-banner.tsx
index 1722fc2e5c4..0869f2c44df 100644
--- a/features/admin.login-flow.ai.v1/components/login-flow-ai-banner.tsx
+++ b/features/admin.login-flow.ai.v1/components/login-flow-ai-banner.tsx
@@ -208,7 +208,7 @@ const LoginFlowAIBanner: FunctionComponent<IdentifiableComponentInterface> = (
                 >
                     <TextField
                         name="loginFlowInput"
-                        data-testid="login-flow-ai-input-field"
+                        data-componentid="login-flow-ai-input-field"
                         className="login-flow-ai-input-field"
                         placeholder={ t("ai:aiLoginFlow.banner.input.placeholder") }
                         fullWidth
@@ -284,7 +284,7 @@ const LoginFlowAIBanner: FunctionComponent<IdentifiableComponentInterface> = (
                                         color="secondary"
                                         size="small"
                                         className="login-flow-ai-banner-history-button"
-                                        data-testid="login-flow-ai-banner-history-button"
+                                        data-componentid="login-flow-ai-banner-history-button"
                                     >
                                         { t("ai:aiLoginFlow.promptsHistory") }
                                     </Button>
@@ -303,6 +303,8 @@ const LoginFlowAIBanner: FunctionComponent<IdentifiableComponentInterface> = (
                                                     >
                                                         <Card
                                                             className="login-flow-ai-banner-history-card"
+                                                            data-componentid={
+                                                                `login-flow-ai-banner-history-card-${ index }` }
                                                             onClick={ () => replacePrompt(prompt) }
                                                         >
                                                             <CardContent>
diff --git a/features/common.ai.v1/components/ai-banner.tsx b/features/common.ai.v1/components/ai-banner.tsx
index 3ed14d2dac6..16f03539293 100644
--- a/features/common.ai.v1/components/ai-banner.tsx
+++ b/features/common.ai.v1/components/ai-banner.tsx
@@ -81,7 +81,7 @@ const AIBanner = (props: AIBannerProps): ReactElement => {
                         onClick={ onActionButtonClick }
                         color="primary"
                         variant="contained"
-                        data-testid="ai-banner-action-button"
+                        data-componentid="ai-banner-action-button"
                     >
                         { actionButtonText }
                     </Button>
diff --git a/features/common.ai.v1/components/ai-loading-screen.tsx b/features/common.ai.v1/components/ai-loading-screen.tsx
index 2306687fdf6..c7765d5475e 100644
--- a/features/common.ai.v1/components/ai-loading-screen.tsx
+++ b/features/common.ai.v1/components/ai-loading-screen.tsx
@@ -86,7 +86,7 @@ const AILoadingScreen = (props: AILoadingScreenProps): ReactElement => {
                     !isAnimatedBotDisabled && (
                         <div
                             className="ai-loading-screen-animation-container"
-                            data-testid="ai-loading-screen-animation"
+                            data-componentid="ai-loading-screen-animation-container"
                         >
                             <AIBotAnimatedWithBackGround />
                         </div>