diff --git a/ldvspec/lofardata/templates/lofardata/index.html b/ldvspec/lofardata/templates/lofardata/index.html
index 1c43ea836066391530d4f38c287befbdda2610c8..b2595af0f7efe6ce9c3feeb316e67507c33d856d 100644
--- a/ldvspec/lofardata/templates/lofardata/index.html
+++ b/ldvspec/lofardata/templates/lofardata/index.html
@@ -138,7 +138,7 @@
                                             <span class="icon icon--color-inherit icon--play"></span>
                                         </a>
                                     {% else %}
-                                        <button type="submit" class="button--icon-button" title="Submit to ATDB">
+                                        <button type="submit" class="button--icon-button" test-id="submit-to-atdb" title="Submit to ATDB">
                                             <span class="icon icon--play"></span>
                                         </button>
                                     {% endif %}
diff --git a/ldvspec/lofardata/templates/lofardata/workspecification/create_update.html b/ldvspec/lofardata/templates/lofardata/workspecification/create_update.html
index c2952bd73d3e16a089553d1701ee490bdada469c..165adf044c256b4952becd902c8c68a7388877c9 100644
--- a/ldvspec/lofardata/templates/lofardata/workspecification/create_update.html
+++ b/ldvspec/lofardata/templates/lofardata/workspecification/create_update.html
@@ -37,7 +37,9 @@
                                                        optionsCaption: '---------',
                                                        optionsText: function(item) { return item.name + ' - ' + item.url},
                                                        optionsValue: 'name',
-                                                       value: selectedProcessingSite"></select>
+                                                       value: selectedProcessingSite"
+                                            test-id="processing_site"
+                                    ></select>
                                 </div>
                             </div>
 
@@ -51,7 +53,9 @@
                                 </div>
                                 <div class="input-select-wrapper icon--inline icon-after icon-after--angle-down">
                                     <select class="input input--select custom__input--fixed-width margin-bottom margin-left"
-                                            id="id_selected_workflow_tag" name="selected_workflow_tag"
+                                            id="id_selected_workflow_tag"
+                                            test-id="workflow_tag"
+                                            name="selected_workflow_tag"
                                             style="width: 12rem"
                                             data-bind="options:tags,
                                                        optionsCaption: caption,
@@ -71,7 +75,10 @@
                                 </div>
                                 <div class="input-select-wrapper icon--inline icon-after icon-after--angle-down">
                                     <select class="input input--select custom__input--fixed-width margin-bottom margin-left"
-                                            id="id_selected_workflow" name="selected_workflow" style="width: 12rem"
+                                            id="id_selected_workflow"
+                                            name="selected_workflow"
+                                            style="width: 12rem"
+                                            test-id="workflow"
                                             data-bind="options:workflowsByTag,
                                                    optionsCaption: caption,
                                                    optionsValue: 'workflow_uri',
@@ -138,7 +145,8 @@
                                          id="div_id_filter_{{ filter.name }}">
                                         <div class="flex-wrapper flex-wrapper--row custom__input--fixed-min-width">
                                             <label class="input__label"
-                                                   for="id_{{ filter.field }}">{{ filter.name }}</label>
+                                                   for="id_{{ filter.field }}"
+                                                   test-id="{{ filter.name }}">{{ filter.name }}</label>
                                             {% if filter.help_text %}
                                                 <a class="tooltip-dias tooltip-dias-right custom--tooltip"
                                                    data-tooltip="{{ filter.help_text }}">m</a>
@@ -147,6 +155,7 @@
                                         <div class="input-select-wrapper icon--inline icon-after icon-after--angle-down margin-left margin-bottom">
                                             <select class="input input--select custom__input--fixed-width"
                                                     id="id_{{ filter.field }}"
+                                                    test-id="{{ filter.name }}"
                                                     name="{{ filter.field }}"
                                                     data-filter="{{ filter.lookup_type }}"
                                                     style="width: 12rem">
@@ -174,6 +183,7 @@
                                 type="submit"
                                 name="action"
                                 value="Submit"
+                                test-id="create-update"
                                 title="
                                 {% if object.pk %}
                                 Update the task
diff --git a/ldvspec/lofardata/templates/lofardata/workspecification/detail.html b/ldvspec/lofardata/templates/lofardata/workspecification/detail.html
index e048a19d9f8d871c07fc2783f1a65cc2c6d24490..797c0e6472a6dff698d35de98cd701f54151ea1c 100644
--- a/ldvspec/lofardata/templates/lofardata/workspecification/detail.html
+++ b/ldvspec/lofardata/templates/lofardata/workspecification/detail.html
@@ -128,7 +128,7 @@
                                     {% if object.get_submission_status_display == "undefined"  or object.get_submission_status_display == "not submitted" %}
                                         {% define "primary" as badgecolor %}
                                     {% endif %}
-                                    <div class="badge badge--{{ badgecolor }}">{{ object.get_submission_status_display }}</div>
+                                    <div class="badge badge--{{ badgecolor }}" test-id="submission-status">{{ object.get_submission_status_display }}</div>
                                 </div>
                             </div>
 
diff --git a/ldvspec/lofardata/templates/lofardata/workspecification/inputs.html b/ldvspec/lofardata/templates/lofardata/workspecification/inputs.html
index a21f010806ac034b0fdeaefaeae417125aa018b7..01debbdae6c05a6d43089c53a73fc8db2c69a3b8 100644
--- a/ldvspec/lofardata/templates/lofardata/workspecification/inputs.html
+++ b/ldvspec/lofardata/templates/lofardata/workspecification/inputs.html
@@ -6,14 +6,14 @@
     <div class="overlay">
         <div class="modal-dias-wrapper">
             <div class="modal-dias modal-dias--fit-content">
-                <a class="icon icon--times button--close" href="{% url 'specification-detail' object.pk %}"></a>
+                <a class="icon icon--times button--close" href="{% url 'specification-detail' object.pk %}" test-id="inputs-close"></a>
                 <header class="flex-wrapper flex-wrapper--centered flex-wrapper--column">
                     <h2 class="title">Input fields
                         <a class="tooltip-dias tooltip-dias-bottom" data-tooltip="ATDB says nom nom nom (talk to Fanna or Klaas)">m</a>
                     </h2>
                 </header>
                 <div>
-                    <pre>{{ object.inputs | pretty_json }}</pre>
+                    <pre test-id="inputs">{{ object.inputs | pretty_json }}</pre>
                 </div>
             </div>
         </div>