diff --git a/frontend/src/app/GN2CommonModule/form/dynamic-form/dynamic-form.component.html b/frontend/src/app/GN2CommonModule/form/dynamic-form/dynamic-form.component.html
index 6063bbb6f3..89e595652e 100644
--- a/frontend/src/app/GN2CommonModule/form/dynamic-form/dynamic-form.component.html
+++ b/frontend/src/app/GN2CommonModule/form/dynamic-form/dynamic-form.component.html
@@ -50,7 +50,7 @@
       [formControl]="form.get(formDefComp['attribut_name'])"
       id="{{ formDefComp['attribut_name'] }}_{{ rand }}"
       type="text"
-      data-qa="field-text-{{ formDefComp['attribut_name'] }}_{{ rand }}"
+      [attr.data-qa]="'field-text' + '-' + formDefComp['attribut_name'] + '_' + rand"
     />
     <div
       *ngIf="
@@ -67,7 +67,7 @@
       [formControl]="form.get(formDefComp['attribut_name'])"
       id="{{ formDefComp['attribut_name'] }}_{{ rand }}"
       type="time"
-      [attr.data-qa]="'field-time' + formDefComp['attribut_name'] + '_' + rand"
+      [attr.data-qa]="'field-time' + '-' + formDefComp['attribut_name'] + '_' + rand"
     />
 
     <input
diff --git a/frontend/src/app/modules/imports/components/import_process/fields-mapping-step/fields-mapping-step.component.html b/frontend/src/app/modules/imports/components/import_process/fields-mapping-step/fields-mapping-step.component.html
index c6be531db4..8f25bc6b89 100644
--- a/frontend/src/app/modules/imports/components/import_process/fields-mapping-step/fields-mapping-step.component.html
+++ b/frontend/src/app/modules/imports/components/import_process/fields-mapping-step/fields-mapping-step.component.html
@@ -25,6 +25,7 @@ <h5 class="card-title mb-0">{{ 'Import.FieldMapping.Title' | translate }}</h5>
                 class="entity-tab-label"
                 [matBadge]="invalidEntityControls(entitythemes.entity.label)"
                 [matBadgeHidden]="invalidEntityControls(entitythemes.entity.label) < 1"
+                [attr.data-qa]="'import-entity-tab-'+entitythemes.entity.label"
               >
                 {{ entitythemes.entity.label }}
               </span>