diff --git a/e2e/list.e2e-spec.ts b/e2e/list.e2e-spec.ts
index 027322c634866a0ba3e80eaac8f57bc16cba143e..775a2735ff0c673b32a7f677ed115e7548116097 100644
--- a/e2e/list.e2e-spec.ts
+++ b/e2e/list.e2e-spec.ts
@@ -9,6 +9,7 @@ describe("ngHyd − list page", () => {
 
   it("when list is open, user should see the list of available compute nodes", async () => {
     await page.navigateTo();
+    expect(page.getThemesCardsLength()).toBeGreaterThan(4);
     expect(page.getCalculatorsMenuLength()).toBeGreaterThan(8);
   });
 });
diff --git a/e2e/list.po.ts b/e2e/list.po.ts
index 8b21d46d14e7c398dda682b1b061711f774e07b8..2f06248a15933ff12b610e0870991d8d4cfe39dc 100644
--- a/e2e/list.po.ts
+++ b/e2e/list.po.ts
@@ -5,12 +5,20 @@ export class ListPage {
     return browser.get("/#/list");
   }
 
+  getThemesCards() {
+    return element.all(by.css("mat-card.compute-nodes-theme"));
+  }
+
+  async getThemesCardsLength() {
+    return await this.getThemesCards().count();
+  }
+
   getCalculatorsMenuEntries() {
-    return element.all(by.css("ul.list-group"));
+    return element.all(by.css("mat-card.compute-nodes-theme button.theme-calculator"));
   }
 
-  getCalculatorsMenuLength() {
-    return this.getCalculatorsMenuEntries().count();
+  async getCalculatorsMenuLength() {
+    return await this.getCalculatorsMenuEntries().count();
   }
 
   async clickRandomCalculatorMenuEntry() {