diff --git a/features/admin.validation.v1/components/password-expiry-rule-list.tsx b/features/admin.validation.v1/components/password-expiry-rule-list.tsx
index ca752372013..85e2a3c0a13 100644
--- a/features/admin.validation.v1/components/password-expiry-rule-list.tsx
+++ b/features/admin.validation.v1/components/password-expiry-rule-list.tsx
@@ -291,7 +291,7 @@ export const PasswordExpiryRuleList: FunctionComponent<PasswordExpiryRuleListPro
 
         return (
             valueOptions.map((item: Resource) => (
-                <MenuItem key={ item.id } value={ item.id } className="flex-row-gap-10 ">
+                <MenuItem key={ item.id } value={ item.id } className="flex-row-gap-10">
                     <Checkbox checked={ rule?.values.indexOf(item.id) > -1 } />
                     <Chip label={ getResourceIdentifier(item, isRoleAttribute) } />
                     <ListItemText primary={ getResourceDisplayName(item, isRoleAttribute) } />
@@ -377,7 +377,7 @@ export const PasswordExpiryRuleList: FunctionComponent<PasswordExpiryRuleListPro
                             <TextField
                                 type="number"
                                 value={ defaultPasswordExpiryTime }
-
+                                data-componentid={ `${componentId}-default-expiry-time` }
                                 onChange={ handleDefaultExpiryTimeChange }
                                 disabled={ !isPasswordExpiryEnabled }
                                 inputProps={ {
diff --git a/features/admin.validation.v1/pages/validation-config-edit.tsx b/features/admin.validation.v1/pages/validation-config-edit.tsx
index 8d9a5d7cc72..e2a9ee58237 100644
--- a/features/admin.validation.v1/pages/validation-config-edit.tsx
+++ b/features/admin.validation.v1/pages/validation-config-edit.tsx
@@ -969,13 +969,14 @@ export const ValidationConfigEditPage: FunctionComponent<MyAccountSettingsEditPa
                         <Switch
                             checked={ passwordExpiryEnabled }
                             disabled={ isReadOnly }
+                            data-componentid={ `${ componentId }-password-expiry-toggle` }
                             onChange={
                                 () => setPasswordExpiryEnabled(!passwordExpiryEnabled)
                             } />
                     </Heading>
                 </div>
                 <PasswordExpiryRuleList
-                    componentId={ "`${componentId}-password-expiry-rules`" }
+                    componentId={ `${componentId}-password-expiry-rules` }
                     isPasswordExpiryEnabled={ passwordExpiryEnabled }
                     isSkipFallbackEnabled={ passwordExpirySkipFallback }
                     defaultPasswordExpiryTime={ defaultPasswordExpiryTime }