diff --git a/alfa-client/apps/admin-e2e/src/support/commands.ts b/alfa-client/apps/admin-e2e/src/support/commands.ts
index 5442317e9972045e9b6be4644c4bbd5621377682..78425e12874182dac52fc40091c94a89efb0e674 100644
--- a/alfa-client/apps/admin-e2e/src/support/commands.ts
+++ b/alfa-client/apps/admin-e2e/src/support/commands.ts
@@ -74,11 +74,11 @@ Cypress.Commands.add('getTestElementWithOid', (oid, ...args) => {
 });
 
 Cypress.Commands.add('findTestElementWithClass', { prevSubject: true }, (subject: any, selector) => {
-  return subject.find(`[${DATA_TEST_CLASS}="${selector}"]`);
+  return cy.wrap(subject).find(`[${DATA_TEST_CLASS}~="${selector}"]`);
 });
 
 Cypress.Commands.add('findElement', { prevSubject: true }, (subject: any, selector: string) => {
-  return subject.find(selector);
+  return cy.wrap(subject).find(selector);
 });
 
 Cypress.Commands.add('getUserInfo', () => {
diff --git a/alfa-client/apps/alfa-e2e/src/support/commands.ts b/alfa-client/apps/alfa-e2e/src/support/commands.ts
index 30e88fd0f58f79fb5d3db717bb46a835fc2b5b54..37d907a23050fb90dba10f30f6985979a42516d9 100644
--- a/alfa-client/apps/alfa-e2e/src/support/commands.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/commands.ts
@@ -107,11 +107,11 @@ Cypress.Commands.add('getTestElementWithOid', (oid, ...args) => {
 });
 
 Cypress.Commands.add('findTestElementWithClass', { prevSubject: true }, (subject: any, selector) => {
-  return subject.find(`[${DATA_TEST_CLASS}="${selector}"]`);
+  return cy.wrap(subject).find(`[${DATA_TEST_CLASS}~="${selector}"]`);
 });
 
 Cypress.Commands.add('findElement', { prevSubject: true }, (subject: any, selector: string) => {
-  return subject.find(selector);
+  return cy.wrap(subject).find(selector);
 });
 
 Cypress.Commands.add('login', (user: string, password: string) => {