diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html
index c783e380e8..177abb6cec 100644
--- a/demo-shell-ng2/app/app.component.html
+++ b/demo-shell-ng2/app/app.component.html
@@ -13,7 +13,7 @@
                 <a class="mdl-navigation__link" data-automation-id="login" href="" [routerLink]="['Login']">Login</a>
             </nav>
             <!-- Right aligned menu below button -->
-            <button id="demo-menu-language-right" data-automation-id="language menu"
+            <button id="demo-menu-language-right" data-automation-id="language-menu"
                     class="mdl-button mdl-js-button mdl-button--icon">
                 <i class="material-icons">Language</i>
             </button>
@@ -24,7 +24,7 @@
                 <li class="mdl-menu__item" (click)="changeLanguage('it')">Ita</li>
             </ul>
             <!-- Right aligned menu below button -->
-            <button id="demo-menu-lower-right" data-automation-id="right action menu"
+            <button id="demo-menu-lower-right" data-automation-id="right-action-menu"
                     class="mdl-button mdl-js-button mdl-button--icon">
                 <i class="material-icons">more_vert</i>
             </button>