diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml
index 23a4ff3c2..89d8f044b 100644
--- a/.github/workflows/permissions.yml
+++ b/.github/workflows/permissions.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Run TestCafe Tests
         uses: DevExpress/testcafe-action@latest
         with:
-          args: '"chrome:headless" portal-ui/tests/permissions/ --skip-js-errors '
+          args: '"chrome:headless" portal-ui/tests/permissions/ --skip-js-errors -c 3'
 
       - name: Clean up users & policies
         run: |
diff --git a/portal-ui/tests/permissions/diagnostics.ts b/portal-ui/tests/permissions/diagnostics.ts
index 7f26b7a6a..4b6c5f42f 100644
--- a/portal-ui/tests/permissions/diagnostics.ts
+++ b/portal-ui/tests/permissions/diagnostics.ts
@@ -61,7 +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(2000)
+    .wait(3000)
     .expect(elements.downloadButton.exists)
     .ok();
 });
diff --git a/portal-ui/tests/permissions/groups.ts b/portal-ui/tests/permissions/groups.ts
index c4c50d2a4..8017adaa3 100644
--- a/portal-ui/tests/permissions/groups.ts
+++ b/portal-ui/tests/permissions/groups.ts
@@ -106,7 +106,11 @@ test.before(async (t) => {
   }
 );
 
-test("Groups table exists", async (t) => {
+test.before(async (t) => {
+  // A user must be created as we need to choose a user from the dropdown
+  await functions.createUser(t);
+  await createGroup(t, "groups-table");
+})("Groups table exists", async (t) => {
   await t
     .navigateTo("http://localhost:9090/identity/groups")
     .expect(elements.table.exists)
@@ -115,6 +119,7 @@ test("Groups table exists", async (t) => {
 
 test.before(async (t) => {
   // A user must be created as we need to choose a user from the dropdown
+  await functions.createUser(t);
   await createGroup(t, "disable-enable");
 })("Created Group can be disabled and enabled back", async (t) => {
   await t
@@ -130,6 +135,7 @@ test.before(async (t) => {
 
 test.before(async (t) => {
   // A user must be created as we need to choose a user from the dropdown
+  await functions.createUser(t);
   await createGroup(t, "view-delete");
 })("Created Group can be viewed and deleted", async (t) => {
   await t
diff --git a/portal-ui/tests/scripts/permissions.sh b/portal-ui/tests/scripts/permissions.sh
index 7891e97df..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)
+  (yarn start &> /dev/null) & (./console server &> /dev/null) & (testcafe "chrome:headless" portal-ui/tests/permissions/ -q --skip-js-errors -c 3)
   cleanup
 }