diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html
index a988633254..de693db249 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html
@@ -1,7 +1,7 @@
 <div [ngClass]="{hide:  isUploadCompleted()}" [ngClass]="{show:   !isUploadCompleted()}"
      class="body-dialog-header">
     <div class="body-dialog-action"></div>
-    <div class="body-dialog-cancel"><a href="#" (click)="cancelAllFiles()">{{'FILE_UPLOAD.BUTTON.CANCEL' | translate}}</a></div>
+    <div class="body-dialog-cancel"><a data-automation-id="cancel_upload_all" href="#" (click)="cancelAllFiles()">{{'FILE_UPLOAD.BUTTON.CANCEL' | translate}}</a></div>
 </div>
 <table class="mdl-data-table mdl-js-data-table mdl-shadow--2dp">
     <tr>
@@ -23,7 +23,7 @@
         <td class="mdl-data-table__cell--non-numeric">{{file.size}}</td>
         <td>
             <span *ngIf="file.done && !file.abort"><i data-automation-id="done_icon" class="material-icons">done</i></span>
-            <span *ngIf="file.uploading" (click)="abort(file.id)" class="cursor" ><i class="material-icons">remove_circle_outline</i></span>
+            <span *ngIf="file.uploading" (click)="abort(file.id)" class="cursor" ><i data-automation-id="{{file.name}}_cancel_upload" class="material-icons">remove_circle_outline</i></span>
             <span *ngIf="file.abort"><i class="material-icons">remove_circle</i></span>
             <span *ngIf="!file.abort && !file.uploading && !file.done"><i class="material-icons">pause</i></span>
         </td>
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html
index 0dea421cff..fcb9aa0281 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.html
@@ -6,7 +6,7 @@
         <!--Multiple Files Upload-->
         <span *ngIf="multipleFiles">
             <label for="upload-multiple-files">{{'FILE_UPLOAD.BUTTON.UPLOAD_FILE' | translate}}</label>
-            <input id="upload-multiple-files" type="file" name="uploadFiles"
+            <input id="upload-multiple-files" data-automation-id="upload-multiple-files" type="file" name="uploadFiles"
                    (change)="onFilesAdded($event)"
                    multiple="multiple"
                    accept="{{acceptedFilesType}}"
@@ -16,7 +16,7 @@
         <!--Single Files Upload-->
         <span *ngIf="!multipleFiles">
             <label for="upload-single-file">{{'FILE_UPLOAD.BUTTON.UPLOAD_FILE' | translate}}</label>
-            <input id="upload-single-file" type="file" name="uploadFiles"
+            <input id="upload-single-file" data-automation-id="upload-single-file" type="file" name="uploadFiles"
                    (change)="onFilesAdded($event)"
                    accept="{{acceptedFilesType}}"
                    #uploadFiles>
@@ -27,7 +27,7 @@
     <div *ngIf="uploadFolders" class="mdl-button mdl-js-button mdl-button--raised mdl-button--file">
         <i class="material-icons">file_upload</i>
         <label for="uploadFolder">{{'FILE_UPLOAD.BUTTON.UPLOAD_FOLDER' | translate}}</label>
-        <input id="uploadFolder" type="file" name="uploadFiles"
+        <input id="uploadFolder" data-automation-id="uploadFolder" type="file" name="uploadFiles"
                (change)="onDirectoryAdded($event)"
                multiple="multiple"
                accept="{{acceptedFilesType}}"
@@ -40,5 +40,5 @@
 <div id="undo-notification-bar"  class="mdl-js-snackbar mdl-snackbar"
      #undoNotificationBar>
     <div class="mdl-snackbar__text"></div>
-    <button class="mdl-snackbar__action" type="button">{{'FILE_UPLOAD.ACTION.UNDO' | translate}}</button>
-</div>
\ No newline at end of file
+    <button data-automation-id="undo_upload_button" class="mdl-snackbar__action" type="button">{{'FILE_UPLOAD.ACTION.UNDO' | translate}}</button>
+</div>