diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html
index ac4fc2d0cc010459031b8c9d6192cdac293ad288..4cccfbe689b149cd7712935505a4bb3c95b67fec 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form-container.component.html
@@ -1,3 +1,3 @@
 <ods-spinner [stateResource]="listStateResource$ | async">
-  <admin-aggregation-mapping-form data-test-id="evaluate-fields-form"></admin-aggregation-mapping-form>
+  <admin-aggregation-mapping-form data-test-id="aggregation-mapping-form" />
 </ods-spinner>
diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html
index d7d2401653c3f4f65f25c00561d4cb11e1f7e908..6b1643e863ce1ef14f5ccb4bc3f5947bb29d157f 100644
--- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html
+++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-list-container/aggregation-mapping-list/aggregation-mapping-list-item/aggregation-mapping-list-item.component.html
@@ -2,15 +2,15 @@
   <dl class="flex w-full">
     <div class="flex-1">
       <dt class="sr-only">Name</dt>
-      <dd class="font-semibold" data-test-class="fullname">{{ aggregationMapping.name }}</dd>
+      <dd class="font-semibold" data-test-class="list-item-name">{{ aggregationMapping.name }}</dd>
     </div>
     <!-- Remove null safe check operator after backend provides correct data. -->
     <div class="flex-wrap flex-1">
       <dt class="sr-only">Formengine</dt>
-      <dd>{{ aggregationMapping.formIdentifier?.formEngineName }}</dd>
+      <dd data-test-class="list-item-form-engine-name">{{ aggregationMapping.formIdentifier?.formEngineName }}</dd>
 
       <dt class="sr-only">Form ID</dt>
-      <dd>{{ aggregationMapping.formIdentifier?.formId }}</dd>
+      <dd data-test-class="list-item-form-id">{{ aggregationMapping.formIdentifier?.formId }}</dd>
     </div>
   </dl>
 </ods-list-item>