diff --git a/portal-ui/tests/permissions/diagnostics.ts b/portal-ui/tests/permissions/diagnostics.ts
index 264ac71c0..4b6c5f42f 100644
--- a/portal-ui/tests/permissions/diagnostics.ts
+++ b/portal-ui/tests/permissions/diagnostics.ts
@@ -61,6 +61,7 @@ test("Download button exists after Diagnostic is completed", async (t) => {
     .useRole(roles.diagnostics)
     .navigateTo("http://localhost:9090/support/diagnostics")
     .click(elements.startDiagnosticButton)
+    .wait(3000)
     .expect(elements.downloadButton.exists)
     .ok();
 });
@@ -70,6 +71,7 @@ test("Download button is clickable after Diagnostic is completed", async (t) =>
     .useRole(roles.diagnostics)
     .navigateTo("http://localhost:9090/support/diagnostics")
     .click(elements.startDiagnosticButton)
+    .wait(2000)
     .click(elements.downloadButton);
 });
 
@@ -78,6 +80,7 @@ test("Start New Diagnostic button exists after Diagnostic is completed", async (
     .useRole(roles.diagnostics)
     .navigateTo("http://localhost:9090/support/diagnostics")
     .click(elements.startDiagnosticButton)
+    .wait(2000)
     .expect(elements.startNewDiagnosticButton.exists)
     .ok();
 });
@@ -87,5 +90,6 @@ test("Start New Diagnostic button is clickable after Diagnostic is completed", a
     .useRole(roles.diagnostics)
     .navigateTo("http://localhost:9090/support/diagnostics")
     .click(elements.startDiagnosticButton)
+    .wait(2000)
     .click(elements.startNewDiagnosticButton);
 });
diff --git a/portal-ui/tests/scripts/permissions.sh b/portal-ui/tests/scripts/permissions.sh
index 91db197b2..82e094ae9 100644
--- a/portal-ui/tests/scripts/permissions.sh
+++ b/portal-ui/tests/scripts/permissions.sh
@@ -80,7 +80,7 @@ __init__() {
 }
 
 main() {
-  (yarn start &> /dev/null) & (./console server &> /dev/null) & (testcafe "chrome:headless" portal-ui/tests/permissions/ -q --skip-js-errors -c 3 --selector-timeout 10000)
+  (yarn start &> /dev/null) & (./console server &> /dev/null) & (testcafe "chrome:headless" portal-ui/tests/permissions/ -q --skip-js-errors -c 3)
   cleanup
 }