diff --git a/cypress/e2e/models/administration/assessment_questionnaire/assessment_questionnaire.ts b/cypress/e2e/models/administration/assessment_questionnaire/assessment_questionnaire.ts
index c6a4513b7..b000bcac1 100644
--- a/cypress/e2e/models/administration/assessment_questionnaire/assessment_questionnaire.ts
+++ b/cypress/e2e/models/administration/assessment_questionnaire/assessment_questionnaire.ts
@@ -30,6 +30,7 @@ export class AssessmentQuestionnaire {
         const itemsPerPage = 100;
         if (forceReload) {
             cy.visit(AssessmentQuestionnaire.fullUrl, { timeout: 35 * SEC }).then((_) => {
+                cy.wait(10 * SEC);
                 selectItemsPerPage(itemsPerPage);
             });
             return;
diff --git a/cypress/e2e/models/migration/archetypes/archetype.ts b/cypress/e2e/models/migration/archetypes/archetype.ts
index 25a71f6ab..b3028f4a4 100644
--- a/cypress/e2e/models/migration/archetypes/archetype.ts
+++ b/cypress/e2e/models/migration/archetypes/archetype.ts
@@ -70,9 +70,12 @@ export class Archetype {
     public static open(forceReload = false) {
         const itemsPerPage = 100;
         if (forceReload) {
-            cy.visit(Archetype.fullUrl, { timeout: 15 * SEC }).then((_) =>
-                selectItemsPerPage(itemsPerPage)
-            );
+            cy.visit(Archetype.fullUrl, { timeout: 15 * SEC }).then((_) => {
+                // This explicit wait is required in some cases.
+                cy.wait(10 * SEC);
+                cy.get("h1", { timeout: 35 * SEC }).should("contain", "Archetypes");
+                selectItemsPerPage(itemsPerPage);
+            });
             return;
         }
 
diff --git a/cypress/e2e/models/migration/controls/stakeholders.ts b/cypress/e2e/models/migration/controls/stakeholders.ts
index 08270596f..7db91c9fd 100644
--- a/cypress/e2e/models/migration/controls/stakeholders.ts
+++ b/cypress/e2e/models/migration/controls/stakeholders.ts
@@ -63,6 +63,7 @@ export class Stakeholders {
     public static openList(forceReload = false): void {
         if (forceReload) {
             cy.visit(Stakeholders.fullUrl, { timeout: 35 * SEC }).then((_) => {
+                cy.wait(10 * SEC);
                 cy.get("h1", { timeout: 60 * SEC }).should("contain", "Controls");
                 selectItemsPerPage(100);
             });
diff --git a/cypress/e2e/tests/migration/archetypes/questionnaire_features.test.ts b/cypress/e2e/tests/migration/archetypes/questionnaire_features.test.ts
index 33d753a43..d69670524 100644
--- a/cypress/e2e/tests/migration/archetypes/questionnaire_features.test.ts
+++ b/cypress/e2e/tests/migration/archetypes/questionnaire_features.test.ts
@@ -139,7 +139,9 @@ describe(["@tier3"], "Tests for archetype questionnaire features", () => {
     after("Perform test data clean up", function () {
         Archetype.open(true);
         archetype.delete();
+        Stakeholders.openList(true);
         deleteByList(stakeholderList);
+        AssessmentQuestionnaire.open(true);
         AssessmentQuestionnaire.deleteAllQuestionnaires();
     });
 });
diff --git a/cypress/utils/utils.ts b/cypress/utils/utils.ts
index 64888f765..d8e1f4652 100644
--- a/cypress/utils/utils.ts
+++ b/cypress/utils/utils.ts
@@ -811,7 +811,7 @@ export function clickKebabMenuOptionArchetype(rowItem: string, itemName: string)
         .within(() => {
             click(sideKebabMenu);
         });
-    cy.get(commonView.actionMenuItem).contains(itemName).click();
+    cy.get(commonView.actionMenuItem).contains(itemName).click({ force: true });
 }
 
 export function createMultipleJiraConnections(