diff --git a/demo-shell/src/app/components/theme-picker/theme-picker.html b/demo-shell/src/app/components/theme-picker/theme-picker.html
index 9cf0c7bca9..2a8c93054c 100644
--- a/demo-shell/src/app/components/theme-picker/theme-picker.html
+++ b/demo-shell/src/app/components/theme-picker/theme-picker.html
@@ -1,9 +1,9 @@
-<button mat-icon-button [mat-menu-trigger-for]="themeMenu" matTooltip="Select a theme!">
+<button data-automation-id="theme menu" mat-icon-button [mat-menu-trigger-for]="themeMenu" matTooltip="Select a theme!">
     <mat-icon>format_color_fill</mat-icon>
 </button>
 
 <mat-menu class="docs-theme-picker-menu" #themeMenu="matMenu" x-position="before">
-    <button *ngFor="let theme of themes"  mat-menu-item (click)="installTheme(theme)" >
+    <button *ngFor="let theme of themes" [attr.data-automation-id]="theme.name" mat-menu-item (click)="installTheme(theme)" >
         <mat-icon mat-list-icon [matTooltip]="theme.name" class="docs-theme-chosen-icon" [style.color]="theme.accent"
                  [style.background]="theme.primary"
                  *ngIf="currentTheme === theme">check_circle