diff --git a/src/views/AccessControl/SslCertificates/ModalGenerateCsr.vue b/src/views/AccessControl/SslCertificates/ModalGenerateCsr.vue
index bb74c19..6d6d789 100644
--- a/src/views/AccessControl/SslCertificates/ModalGenerateCsr.vue
+++ b/src/views/AccessControl/SslCertificates/ModalGenerateCsr.vue
@@ -27,6 +27,7 @@
                     <b-form-select
                       id="certificate-type"
                       v-model="form.certificateType"
+                      data-test-id="modalGenerateCsr-select-certificateType"
                       :options="certificateOptions"
                       :state="getValidationState($v.form.certificateType)"
                       @input="$v.form.certificateType.$touch()"
@@ -50,6 +51,7 @@
                     <b-form-select
                       id="country"
                       v-model="form.country"
+                      data-test-id="modalGenerateCsr-select-country"
                       :options="countryOptions"
                       :state="getValidationState($v.form.country)"
                       @input="$v.form.country.$touch()"
@@ -76,6 +78,7 @@
                       id="state"
                       v-model="form.state"
                       type="text"
+                      data-test-id="modalGenerateCsr-input-state"
                       :state="getValidationState($v.form.state)"
                     />
                     <b-form-invalid-feedback role="alert">
@@ -92,6 +95,7 @@
                       id="city"
                       v-model="form.city"
                       type="text"
+                      data-test-id="modalGenerateCsr-input-city"
                       :state="getValidationState($v.form.city)"
                     />
                     <b-form-invalid-feedback role="alert">
@@ -110,6 +114,7 @@
                       id="company-name"
                       v-model="form.companyName"
                       type="text"
+                      data-test-id="modalGenerateCsr-input-companyName"
                       :state="getValidationState($v.form.companyName)"
                     />
                     <b-form-invalid-feedback role="alert">
@@ -126,6 +131,7 @@
                       id="company-unit"
                       v-model="form.companyUnit"
                       type="text"
+                      data-test-id="modalGenerateCsr-input-companyUnit"
                       :state="getValidationState($v.form.companyUnit)"
                     />
                     <b-form-invalid-feedback role="alert">
@@ -144,6 +150,7 @@
                       id="common-name"
                       v-model="form.commonName"
                       type="text"
+                      data-test-id="modalGenerateCsr-input-commonName"
                       :state="getValidationState($v.form.commonName)"
                     />
                     <b-form-invalid-feedback role="alert">
@@ -160,6 +167,7 @@
                       id="challenge-password"
                       v-model="form.challengePassword"
                       type="text"
+                      data-test-id="modalGenerateCsr-input-challengePassword"
                     />
                   </b-form-group>
                 </b-col>
@@ -174,6 +182,7 @@
                       id="contact-person"
                       v-model="form.contactPerson"
                       type="text"
+                      data-test-id="modalGenerateCsr-input-contactPerson"
                     />
                   </b-form-group>
                 </b-col>
@@ -186,6 +195,7 @@
                       id="email-address"
                       v-model="form.emailAddress"
                       type="text"
+                      data-test-id="modalGenerateCsr-input-emailAddress"
                     />
                   </b-form-group>
                 </b-col>
@@ -239,6 +249,7 @@
                     <b-form-select
                       id="key-pair-algorithm"
                       v-model="form.keyPairAlgorithm"
+                      data-test-id="modalGenerateCsr-select-keyPairAlgorithm"
                       :options="keyPairAlgorithmOptions"
                       :state="getValidationState($v.form.keyPairAlgorithm)"
                       @input="$v.form.keyPairAlgorithm.$touch()"
@@ -265,6 +276,7 @@
                       <b-form-select
                         id="key-curve-id"
                         v-model="form.keyCurveId"
+                        data-test-id="modalGenerateCsr-select-keyCurveId"
                         :options="keyCurveIdOptions"
                         :state="getValidationState($v.form.keyCurveId)"
                         @input="$v.form.keyCurveId.$touch()"
@@ -290,6 +302,7 @@
                       <b-form-select
                         id="key-bit-length"
                         v-model="form.keyBitLength"
+                        data-test-id="modalGenerateCsr-select-keyBitLength"
                         :options="keyBitLengthOptions"
                         :state="getValidationState($v.form.keyBitLength)"
                         @input="$v.form.keyBitLength.$touch()"
@@ -319,6 +332,7 @@
           form="generate-csr-form"
           type="submit"
           variant="primary"
+          data-test-id="modalGenerateCsr-button-ok"
           @click="ok()"
         >
           {{ $t('pageSslCertificates.generateCsr') }}
