diff --git a/src/design-system/password-box/uncontrolled-password-box-input.component.tsx b/src/design-system/password-box/uncontrolled-password-box-input.component.tsx
index 7dbda7f..071e721 100644
--- a/src/design-system/password-box/uncontrolled-password-box-input.component.tsx
+++ b/src/design-system/password-box/uncontrolled-password-box-input.component.tsx
@@ -82,7 +82,12 @@ export const UncontrolledPasswordInput = ({
             {label}
           </Form.Label>
           <PasswordInputButton
-            testId={testId && `${testId}-toggle`}
+            testId={
+              testId &&
+              (isPasswordVisible
+                ? `${testId}-hide-icon`
+                : `${testId}-show-icon`)
+            }
             onClick={(event): void => {
               event.preventDefault();
               setIsPasswordVisible(!isPasswordVisible);