diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
index 9cc486d4dd..0fd3875a8e 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html
@@ -11,6 +11,7 @@
         <th class="mdl-data-table__cell--non-numeric {{col.cssClass}}"
             *ngFor="#col of columns"
             [class.column-header]="col.title"
+            [attr.data.automation-id]=“‘auto_id_’ + col.source”
             [class.mdl-data-table__header--sorted-ascending]="sorting.key === col.source && sorting.direction === 'asc'"
             [class.mdl-data-table__header--sorted-descending]="sorting.key === col.source && sorting.direction === 'desc'"
             (click)="onColumnHeaderClick(col)">
@@ -32,7 +33,8 @@
         </td>
     </tr>
 
-    <tr *ngFor="#content of folder.list.entries; #idx = index">
+    <tr *ngFor="#content of folder.list.entries; #idx = index"
+        [attr.data.automation-id]="getObjectValue(content.entry, 'name')">
         <!-- Columns -->
         <td *ngFor="#col of columns" [ngSwitch]="col.source"
             class="mdl-data-table__cell--non-numeric {{content.entry.isFolder ? 'folder-row-cell' : 'document-row-cell'}} {{col.cssClass}}"