diff --git a/polygerrit-ui/app/test/index.html b/polygerrit-ui/app/test/index.html
index 7c87037..781f457 100644
--- a/polygerrit-ui/app/test/index.html
+++ b/polygerrit-ui/app/test/index.html
@@ -22,48 +22,49 @@
 <script src="../bower_components/web-component-tester/browser.js"></script>
 <script>
   var testFiles = [];
+  var basePath = '../elements/';
 
   [
-    '../elements/change/gr-change-actions/gr-change-actions_test.html',
-    '../elements/change/gr-change-metadata/gr-change-metadata_test.html',
-    '../elements/change/gr-change-view/gr-change-view_test.html',
-    '../elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.html',
-    '../elements/change/gr-download-dialog/gr-download-dialog_test.html',
-    '../elements/change/gr-file-list/gr-file-list_test.html',
-    '../elements/change/gr-message/gr-message_test.html',
-    '../elements/change/gr-messages-list/gr-messages-list_test.html',
-    '../elements/change/gr-related-changes-list/gr-related-changes-list_test.html',
-    '../elements/change/gr-reply-dialog/gr-reply-dialog_test.html',
-    '../elements/change/gr-reviewer-list/gr-reviewer-list_test.html',
-    '../elements/change-list/gr-change-list/gr-change-list_test.html',
-    '../elements/change-list/gr-change-list-item/gr-change-list-item_test.html',
-    '../elements/core/gr-account-dropdown/gr-account-dropdown_test.html',
-    '../elements/core/gr-error-manager/gr-error-manager_test.html',
-    '../elements/core/gr-main-header/gr-main-header_test.html',
-    '../elements/core/gr-search-bar/gr-search-bar_test.html',
-    '../elements/diff/gr-diff/gr-diff-builder_test.html',
-    '../elements/diff/gr-diff/gr-diff-group_test.html',
-    '../elements/diff/gr-diff/gr-diff_test.html',
-    '../elements/diff/gr-diff-comment/gr-diff-comment_test.html',
-    '../elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html',
-    '../elements/diff/gr-diff-cursor/gr-diff-cursor_test.html',
-    '../elements/diff/gr-diff-preferences/gr-diff-preferences_test.html',
-    '../elements/diff/gr-diff-view/gr-diff-view_test.html',
-    '../elements/diff/gr-patch-range-select/gr-patch-range-select_test.html',
-    '../elements/shared/gr-alert/gr-alert_test.html',
-    '../elements/shared/gr-account-label/gr-account-label_test.html',
-    '../elements/shared/gr-account-link/gr-account-link_test.html',
-    '../elements/shared/gr-alert/gr-alert_test.html',
-    '../elements/shared/gr-avatar/gr-avatar_test.html',
-    '../elements/shared/gr-change-star/gr-change-star_test.html',
-    '../elements/shared/gr-confirm-dialog/gr-confirm-dialog_test.html',
-    '../elements/shared/gr-cursor-manager/gr-cursor-manager_test.html',
-    '../elements/shared/gr-date-formatter/gr-date-formatter_test.html',
-    '../elements/shared/gr-js-api-interface/gr-js-api-interface_test.html',
-    '../elements/shared/gr-linked-text/gr-linked-text_test.html',
-    '../elements/shared/gr-rest-api-interface/gr-rest-api-interface_test.html',
-    '../elements/shared/gr-storage/gr-storage_test.html',
+    'change-list/gr-change-list-item/gr-change-list-item_test.html',
+    'change-list/gr-change-list/gr-change-list_test.html',
+    'change/gr-change-actions/gr-change-actions_test.html',
+    'change/gr-change-metadata/gr-change-metadata_test.html',
+    'change/gr-change-view/gr-change-view_test.html',
+    'change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.html',
+    'change/gr-download-dialog/gr-download-dialog_test.html',
+    'change/gr-file-list/gr-file-list_test.html',
+    'change/gr-message/gr-message_test.html',
+    'change/gr-messages-list/gr-messages-list_test.html',
+    'change/gr-related-changes-list/gr-related-changes-list_test.html',
+    'change/gr-reply-dialog/gr-reply-dialog_test.html',
+    'change/gr-reviewer-list/gr-reviewer-list_test.html',
+    'core/gr-account-dropdown/gr-account-dropdown_test.html',
+    'core/gr-error-manager/gr-error-manager_test.html',
+    'core/gr-main-header/gr-main-header_test.html',
+    'core/gr-search-bar/gr-search-bar_test.html',
+    'diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html',
+    'diff/gr-diff-comment/gr-diff-comment_test.html',
+    'diff/gr-diff-cursor/gr-diff-cursor_test.html',
+    'diff/gr-diff-preferences/gr-diff-preferences_test.html',
+    'diff/gr-diff-view/gr-diff-view_test.html',
+    'diff/gr-diff/gr-diff-builder_test.html',
+    'diff/gr-diff/gr-diff-group_test.html',
+    'diff/gr-diff/gr-diff_test.html',
+    'diff/gr-patch-range-select/gr-patch-range-select_test.html',
+    'shared/gr-account-label/gr-account-label_test.html',
+    'shared/gr-account-link/gr-account-link_test.html',
+    'shared/gr-alert/gr-alert_test.html',
+    'shared/gr-avatar/gr-avatar_test.html',
+    'shared/gr-change-star/gr-change-star_test.html',
+    'shared/gr-confirm-dialog/gr-confirm-dialog_test.html',
+    'shared/gr-cursor-manager/gr-cursor-manager_test.html',
+    'shared/gr-date-formatter/gr-date-formatter_test.html',
+    'shared/gr-js-api-interface/gr-js-api-interface_test.html',
+    'shared/gr-linked-text/gr-linked-text_test.html',
+    'shared/gr-rest-api-interface/gr-rest-api-interface_test.html',
+    'shared/gr-storage/gr-storage_test.html',
   ].forEach(function(file) {
+    file = basePath + file;
     testFiles.push(file);
     testFiles.push(file + '?dom=shadow');
   });