diff --git a/cypress/e2e/pages/pages.js b/cypress/e2e/pages/pages.js
index c8bf540e2..452f6fb45 100644
--- a/cypress/e2e/pages/pages.js
+++ b/cypress/e2e/pages/pages.js
@@ -131,14 +131,14 @@ describe("Tests for pages", () => {
                     expect(page.attributes[0].values[0].inputType).to.eq(
                       attributeKey,
                     );
-                    if (attributeType !== "BOOLEAN") {
-                      expect(page.attributes[0].values[0].name).to.eq(
-                        attributeValuesOnPage[attributeType].toString(),
-                      );
-                    } else {
+                    if (attributeKey === "BOOLEAN") {
                       expect(page.attributes[0].values[0].name).to.includes(
                         "Yes".toString(),
                       );
+                    } else {
+                      expect(page.attributes[0].values[0].name).to.eq(
+                        attributeValue.toString(),
+                      );
                     }
                   });
               });