diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardResources/JobWizardResources.js b/src/components/JobWizard/JobWizardSteps/JobWizardResources/JobWizardResources.js
index defc3d778..c0b8cecb7 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardResources/JobWizardResources.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardResources/JobWizardResources.js
@@ -66,6 +66,7 @@ const JobWizardResources = ({ formState, frontendSpec, stepIsActive }) => {
       <div className="form-row form-table-title">Node selection</div>
       <div className="form-row">
         <FormKeyValueTable
+          actionButtonId="add-node-selector"
           addNewItemLabel="Add node selector"
           exitEditModeTriggerItem={stepIsActive}
           fieldsPath={`${RESOURCES_STEP}.nodeSelectorTable`}
diff --git a/src/elements/FormVolumesTable/FormVolumesTable.js b/src/elements/FormVolumesTable/FormVolumesTable.js
index 7cc3ebe8f..cf5644ee3 100644
--- a/src/elements/FormVolumesTable/FormVolumesTable.js
+++ b/src/elements/FormVolumesTable/FormVolumesTable.js
@@ -85,6 +85,7 @@ const FormVolumesTable = ({ disabled, exitEditModeTriggerItem, fieldsPath, formS
                 hidden={editingItem?.ui?.isNew}
                 fields={fields}
                 fieldsPath={fieldsPath}
+                id="add-volume"
                 label="Add volume"
                 onClick={(...addRowArgs) =>
                   addNewRow(...addRowArgs, {
@@ -111,7 +112,7 @@ const FormVolumesTable = ({ disabled, exitEditModeTriggerItem, fieldsPath, formS
 
 FormVolumesTable.defaultProps = {
   disabled: false,
-  exitEditModeTriggerItem: null,
+  exitEditModeTriggerItem: null
 }
 
 FormVolumesTable.propTypes = {