diff --git a/tests/cypress/latest/e2e/unit_tests/capa_eks_cluster.spec.ts b/tests/cypress/latest/e2e/unit_tests/capa_eks_cluster.spec.ts
index 1159550..8d175db 100644
--- a/tests/cypress/latest/e2e/unit_tests/capa_eks_cluster.spec.ts
+++ b/tests/cypress/latest/e2e/unit_tests/capa_eks_cluster.spec.ts
@@ -41,6 +41,7 @@ describe('Import CAPA EKS', { tags: '@full' }, () => {
 
     // Check cluster is Active
     cy.clickButton('Manage');
+    cy.typeInFilter(clusterName);
     cy.contains(new RegExp('Active.*' + clusterName), { timeout: 300000 });
   })
 
@@ -54,28 +55,28 @@ describe('Import CAPA EKS', { tags: '@full' }, () => {
     })
   );
 
-  qase(15,
-    it('Remove imported CAPA cluster from Rancher Manager', { retries: 1 }, () => {
+  // qase(15,
+  //   it('Remove imported CAPA cluster from Rancher Manager', { retries: 1 }, () => {
 
-      // Check cluster is not deleted after removal
-      cy.deleteCluster(clusterName);
-      cy.goToHome();
-      // kubectl get clusters.cluster.x-k8s.io
-      // This is checked by ensuring the cluster is not available in navigation menu
-      cy.contains(clusterName).should('not.exist');
-      cy.checkCAPIClusterProvisioned(clusterName);
-    })
-  );
+  //     // Check cluster is not deleted after removal
+  //     cy.deleteCluster(clusterName);
+  //     cy.goToHome();
+  //     // kubectl get clusters.cluster.x-k8s.io
+  //     // This is checked by ensuring the cluster is not available in navigation menu
+  //     cy.contains(clusterName).should('not.exist');
+  //     cy.checkCAPIClusterProvisioned(clusterName);
+  //   })
+  // );
 
-  qase(16,
-    it('Delete the CAPA cluster fleet repo', () => {
+  // qase(16,
+  //   it('Delete the CAPA cluster fleet repo', () => {
 
-      // Remove the fleet git repo
-      cy.removeFleetGitRepo(repoName)
-      // Wait until the following returns no clusters found
-      // This is checked by ensuring the cluster is not available in CAPI menu
-      cy.checkCAPIClusterDeleted(clusterName, timeout);
-    })
-  );
+  //     // Remove the fleet git repo
+  //     cy.removeFleetGitRepo(repoName)
+  //     // Wait until the following returns no clusters found
+  //     // This is checked by ensuring the cluster is not available in CAPI menu
+  //     cy.checkCAPIClusterDeleted(clusterName, timeout);
+  //   })
+  // );
 
 });
diff --git a/tests/cypress/latest/e2e/unit_tests/capa_rke2_cluster.spec.ts b/tests/cypress/latest/e2e/unit_tests/capa_rke2_cluster.spec.ts
index 77ecec6..cbf95cb 100644
--- a/tests/cypress/latest/e2e/unit_tests/capa_rke2_cluster.spec.ts
+++ b/tests/cypress/latest/e2e/unit_tests/capa_rke2_cluster.spec.ts
@@ -42,6 +42,7 @@ describe('Import CAPA RKE2', { tags: '@full' }, () => {
 
     // Check cluster is Active
     cy.clickButton('Manage');
+    cy.typeInFilter(clusterName);
     cy.contains(new RegExp('Active.*' + clusterName), { timeout: 300000 });
   })
 
diff --git a/tests/cypress/latest/e2e/unit_tests/capz_cluster.spec.ts b/tests/cypress/latest/e2e/unit_tests/capz_cluster.spec.ts
index 030df4b..09e47fd 100644
--- a/tests/cypress/latest/e2e/unit_tests/capz_cluster.spec.ts
+++ b/tests/cypress/latest/e2e/unit_tests/capz_cluster.spec.ts
@@ -95,6 +95,7 @@ describe('Import CAPZ', { tags: '@full' }, () => {
 
     // Check cluster is Active
     cy.clickButton('Manage');
+    cy.typeInFilter(clusterName);
     cy.contains(new RegExp('Active.*' + clusterName), { timeout: 300000 });
   })
   );