diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
index 49362b9421f..2d7f1f3c423 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
@@ -3,7 +3,12 @@
     <h2 bitTypography="h5">{{ "customFields" | i18n }}</h2>
   </bit-section-header>
   <form [formGroup]="customFieldsForm">
-    <bit-card formArrayName="fields" cdkDropList (cdkDropListDropped)="drop($event)">
+    <bit-card
+      formArrayName="fields"
+      cdkDropList
+      (cdkDropListDropped)="drop($event)"
+      data-testid="custom-fields"
+    >
       <div
         *ngFor="let field of fields.controls; let i = index"
         [formGroupName]="i"
@@ -11,6 +16,7 @@
         [ngClass]="{
           'tw-items-center': field.value.type === FieldType.Boolean
         }"
+        [attr.data-testid]="field.value.name + '-entry'"
         cdkDrag
         #customFieldRow
       >