diff --git a/e2e/playwright/authentication/src/tests/general.spec.ts b/e2e/playwright/authentication/src/tests/general.e2e.ts
similarity index 98%
rename from e2e/playwright/authentication/src/tests/general.spec.ts
rename to e2e/playwright/authentication/src/tests/general.e2e.ts
index 63bcfc4ba..8bb2367c6 100644
--- a/e2e/playwright/authentication/src/tests/general.spec.ts
+++ b/e2e/playwright/authentication/src/tests/general.e2e.ts
@@ -30,7 +30,7 @@ test.describe('Create folders', () => {
   let randomFolderName: string;
   const sessionTestUser = {
     username: `user-${Utils.random()}`,
-    password: 'user password'
+    password: Utils.random()
   };
 
   test.beforeAll(async () => {
diff --git a/e2e/playwright/authentication/src/tests/login.spec.ts b/e2e/playwright/authentication/src/tests/login.e2e.ts
similarity index 98%
rename from e2e/playwright/authentication/src/tests/login.spec.ts
rename to e2e/playwright/authentication/src/tests/login.e2e.ts
index 846a638bf..53f425316 100644
--- a/e2e/playwright/authentication/src/tests/login.spec.ts
+++ b/e2e/playwright/authentication/src/tests/login.e2e.ts
@@ -31,6 +31,7 @@ test.describe('viewer file', () => {
   const otherLanguageUser = {
     /* cspell:disable-next-line */
     username: `пользвате${Utils.random()}`,
+    /* cspell:disable-next-line */
     password: '密碼中國'
   };
 
@@ -45,7 +46,7 @@ test.describe('viewer file', () => {
 
   const testUser2 = {
     username: `user-${Utils.random()}`,
-    password: 'user2 password'
+    password: Utils.random()
   };
   const newPassword = 'new password';
 
diff --git a/e2e/playwright/authentication/src/tests/logout.spec.ts b/e2e/playwright/authentication/src/tests/logout.e2e.ts
similarity index 98%
rename from e2e/playwright/authentication/src/tests/logout.spec.ts
rename to e2e/playwright/authentication/src/tests/logout.e2e.ts
index 706f9cbb8..d70d60b68 100644
--- a/e2e/playwright/authentication/src/tests/logout.spec.ts
+++ b/e2e/playwright/authentication/src/tests/logout.e2e.ts
@@ -29,8 +29,9 @@ test.describe('viewer file', () => {
   const apiClientFactory = new ApiClientFactory();
   const testUser = {
     username: `user-${Utils.random()}`,
-    password: 'user password'
+    password: Utils.random()
   };
+
   test.beforeAll(async () => {
     await apiClientFactory.setUpAcaBackend('admin');
     await apiClientFactory.createUser(testUser);
diff --git a/e2e/playwright/copy-move-actions/src/tests/copy.test.ts b/e2e/playwright/copy-move-actions/src/tests/copy.e2e.ts
similarity index 100%
rename from e2e/playwright/copy-move-actions/src/tests/copy.test.ts
rename to e2e/playwright/copy-move-actions/src/tests/copy.e2e.ts
diff --git a/e2e/playwright/copy-move-actions/src/tests/destination-picker-dialog.test.ts b/e2e/playwright/copy-move-actions/src/tests/destination-picker-dialog.e2e.ts
similarity index 100%
rename from e2e/playwright/copy-move-actions/src/tests/destination-picker-dialog.test.ts
rename to e2e/playwright/copy-move-actions/src/tests/destination-picker-dialog.e2e.ts
diff --git a/e2e/playwright/copy-move-actions/src/tests/move.test.ts b/e2e/playwright/copy-move-actions/src/tests/move.e2e.ts
similarity index 100%
rename from e2e/playwright/copy-move-actions/src/tests/move.test.ts
rename to e2e/playwright/copy-move-actions/src/tests/move.e2e.ts
diff --git a/e2e/playwright/create-actions/src/tests/create-file-from-template.spec.ts b/e2e/playwright/create-actions/src/tests/create-file-from-template.e2e.ts
similarity index 100%
rename from e2e/playwright/create-actions/src/tests/create-file-from-template.spec.ts
rename to e2e/playwright/create-actions/src/tests/create-file-from-template.e2e.ts
diff --git a/e2e/playwright/create-actions/src/tests/create-folder-from-template.spec.ts b/e2e/playwright/create-actions/src/tests/create-folder-from-template.e2e.ts
similarity index 100%
rename from e2e/playwright/create-actions/src/tests/create-folder-from-template.spec.ts
rename to e2e/playwright/create-actions/src/tests/create-folder-from-template.e2e.ts
diff --git a/e2e/playwright/create-actions/src/tests/create-folder.spec.ts b/e2e/playwright/create-actions/src/tests/create-folder.e2e.ts
similarity index 100%
rename from e2e/playwright/create-actions/src/tests/create-folder.spec.ts
rename to e2e/playwright/create-actions/src/tests/create-folder.e2e.ts
diff --git a/e2e/playwright/create-actions/src/tests/create-library.spec.ts b/e2e/playwright/create-actions/src/tests/create-library.e2e.ts
similarity index 100%
rename from e2e/playwright/create-actions/src/tests/create-library.spec.ts
rename to e2e/playwright/create-actions/src/tests/create-library.e2e.ts
diff --git a/e2e/playwright/folder-rules/src/tests/actions.spec.ts b/e2e/playwright/folder-rules/src/tests/actions.e2e.ts
similarity index 91%
rename from e2e/playwright/folder-rules/src/tests/actions.spec.ts
rename to e2e/playwright/folder-rules/src/tests/actions.e2e.ts
index e50711ac2..7c7355ab7 100644
--- a/e2e/playwright/folder-rules/src/tests/actions.spec.ts
+++ b/e2e/playwright/folder-rules/src/tests/actions.e2e.ts
@@ -23,13 +23,13 @@
  */
 
 import { expect } from '@playwright/test';
-import { ActionType, ApiClientFactory, getUserState, test } from '@alfresco/playwright-shared';
+import { ActionType, ApiClientFactory, getUserState, test, Utils } from '@alfresco/playwright-shared';
 
 test.use({ storageState: getUserState('hruser') });
 test.describe('Folder Rules Actions', () => {
   const apiClientFactory = new ApiClientFactory();
-  const randomFolderName = `playwright-folder-${(Math.random() + 1).toString(36).substring(6)}`;
-  const randomRuleName = `playwright-rule-${(Math.random() + 1).toString(36).substring(6)}`;
+  const randomFolderName = `playwright-folder-${Utils.random()}`;
+  const randomRuleName = `playwright-rule-${Utils.random()}`;
   const checkInValue = 'check In Value';
   const actionValue = ' A site which contains sfdc content [sfdc:site] ';
   const autoDeclareOptionsValue = 'For all major and minor versions [ALL]';
diff --git a/e2e/playwright/folder-rules/src/tests/conditions.spec.ts b/e2e/playwright/folder-rules/src/tests/conditions.e2e.ts
similarity index 92%
rename from e2e/playwright/folder-rules/src/tests/conditions.spec.ts
rename to e2e/playwright/folder-rules/src/tests/conditions.e2e.ts
index 1ec0740a8..937f0eb4b 100644
--- a/e2e/playwright/folder-rules/src/tests/conditions.spec.ts
+++ b/e2e/playwright/folder-rules/src/tests/conditions.e2e.ts
@@ -23,13 +23,13 @@
  */
 
 import { expect } from '@playwright/test';
-import { ActionType, ApiClientFactory, Comparator, Field, getUserState, test } from '@alfresco/playwright-shared';
+import { ActionType, ApiClientFactory, Comparator, Field, getUserState, test, Utils } from '@alfresco/playwright-shared';
 
 test.use({ storageState: getUserState('hruser') });
 test.describe('Folder Rules Conditions', () => {
   const apiClientFactory = new ApiClientFactory();
-  const randomFolderName = `playwright-folder-${(Math.random() + 1).toString(36).substring(6)}`;
-  const randomRuleName = `playwright-rule-${(Math.random() + 1).toString(36).substring(6)}`;
+  const randomFolderName = `playwright-folder-${Utils.random()}`;
+  const randomRuleName = `playwright-rule-${Utils.random()}`;
   const specialChars = '!@£$%^&*()~#/';
 
   let folderId: string;
diff --git a/e2e/playwright/folder-rules/src/tests/manage-rules.spec.ts b/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts
similarity index 88%
rename from e2e/playwright/folder-rules/src/tests/manage-rules.spec.ts
rename to e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts
index 89609dccb..2e64f427c 100644
--- a/e2e/playwright/folder-rules/src/tests/manage-rules.spec.ts
+++ b/e2e/playwright/folder-rules/src/tests/manage-rules.e2e.ts
@@ -22,13 +22,13 @@
  * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { ApiClientFactory, getUserState, test } from '@alfresco/playwright-shared';
+import { ApiClientFactory, getUserState, test, Utils } from '@alfresco/playwright-shared';
 
 test.use({ storageState: getUserState('hruser') });
 test.describe('Rules - Manage Rules', () => {
   const apiClientFactory = new ApiClientFactory();
-  const randomName = `playwright-folder-${(Math.random() + 1).toString(36).substring(6)}`;
-  const randomRuleName = `playwright-rule-${(Math.random() + 1).toString(36).substring(6)}`;
+  const randomName = `playwright-folder-${Utils.random()}`;
+  const randomRuleName = `playwright-rule-${Utils.random()}`;
 
   let folderId: string;
 
diff --git a/e2e/playwright/info-drawer/src/tests/comments.spec.ts b/e2e/playwright/info-drawer/src/tests/comments.e2e.ts
similarity index 100%
rename from e2e/playwright/info-drawer/src/tests/comments.spec.ts
rename to e2e/playwright/info-drawer/src/tests/comments.e2e.ts
diff --git a/e2e/playwright/info-drawer/src/tests/file-folder-properties.spec.ts b/e2e/playwright/info-drawer/src/tests/file-folder-properties.e2e.ts
similarity index 100%
rename from e2e/playwright/info-drawer/src/tests/file-folder-properties.spec.ts
rename to e2e/playwright/info-drawer/src/tests/file-folder-properties.e2e.ts
diff --git a/e2e/playwright/info-drawer/src/tests/file-preview.spec.ts b/e2e/playwright/info-drawer/src/tests/file-preview.e2e.ts
similarity index 100%
rename from e2e/playwright/info-drawer/src/tests/file-preview.spec.ts
rename to e2e/playwright/info-drawer/src/tests/file-preview.e2e.ts
diff --git a/e2e/playwright/info-drawer/src/tests/general.spec.ts b/e2e/playwright/info-drawer/src/tests/general.e2e.ts
similarity index 100%
rename from e2e/playwright/info-drawer/src/tests/general.spec.ts
rename to e2e/playwright/info-drawer/src/tests/general.e2e.ts
diff --git a/e2e/playwright/info-drawer/src/tests/library-properties.spec.ts b/e2e/playwright/info-drawer/src/tests/library-properties.e2e.ts
similarity index 100%
rename from e2e/playwright/info-drawer/src/tests/library-properties.spec.ts
rename to e2e/playwright/info-drawer/src/tests/library-properties.e2e.ts
diff --git a/e2e/playwright/library-actions/src/tests/library-actions.spec.ts b/e2e/playwright/library-actions/src/tests/library-actions.e2e.ts
similarity index 100%
rename from e2e/playwright/library-actions/src/tests/library-actions.spec.ts
rename to e2e/playwright/library-actions/src/tests/library-actions.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/empty-list.spec.ts b/e2e/playwright/list-views/src/tests/empty-list.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/empty-list.spec.ts
rename to e2e/playwright/list-views/src/tests/empty-list.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/favorites.spec.ts b/e2e/playwright/list-views/src/tests/favorites.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/favorites.spec.ts
rename to e2e/playwright/list-views/src/tests/favorites.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/file-libraries.spec.ts b/e2e/playwright/list-views/src/tests/file-libraries.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/file-libraries.spec.ts
rename to e2e/playwright/list-views/src/tests/file-libraries.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/generic-errors.spec.ts b/e2e/playwright/list-views/src/tests/generic-errors.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/generic-errors.spec.ts
rename to e2e/playwright/list-views/src/tests/generic-errors.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/permissions.spec.ts b/e2e/playwright/list-views/src/tests/permissions.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/permissions.spec.ts
rename to e2e/playwright/list-views/src/tests/permissions.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/personal-files.spec.ts b/e2e/playwright/list-views/src/tests/personal-files.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/personal-files.spec.ts
rename to e2e/playwright/list-views/src/tests/personal-files.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/recent-files.spec.ts b/e2e/playwright/list-views/src/tests/recent-files.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/recent-files.spec.ts
rename to e2e/playwright/list-views/src/tests/recent-files.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/shared-files.spec.ts b/e2e/playwright/list-views/src/tests/shared-files.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/shared-files.spec.ts
rename to e2e/playwright/list-views/src/tests/shared-files.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/sort-list.spec.ts b/e2e/playwright/list-views/src/tests/sort-list.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/sort-list.spec.ts
rename to e2e/playwright/list-views/src/tests/sort-list.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/trash-admin.spec.ts b/e2e/playwright/list-views/src/tests/trash-admin.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/trash-admin.spec.ts
rename to e2e/playwright/list-views/src/tests/trash-admin.e2e.ts
diff --git a/e2e/playwright/list-views/src/tests/trash.spec.ts b/e2e/playwright/list-views/src/tests/trash.e2e.ts
similarity index 100%
rename from e2e/playwright/list-views/src/tests/trash.spec.ts
rename to e2e/playwright/list-views/src/tests/trash.e2e.ts
diff --git a/e2e/playwright/navigation/src/tests/breadcrumb-admin.spec.ts b/e2e/playwright/navigation/src/tests/breadcrumb-admin.e2e.ts
similarity index 100%
rename from e2e/playwright/navigation/src/tests/breadcrumb-admin.spec.ts
rename to e2e/playwright/navigation/src/tests/breadcrumb-admin.e2e.ts
diff --git a/e2e/playwright/navigation/src/tests/breadcrumb.spec.ts b/e2e/playwright/navigation/src/tests/breadcrumb.e2e.ts
similarity index 100%
rename from e2e/playwright/navigation/src/tests/breadcrumb.spec.ts
rename to e2e/playwright/navigation/src/tests/breadcrumb.e2e.ts
diff --git a/e2e/playwright/navigation/src/tests/sidebar.spec.ts b/e2e/playwright/navigation/src/tests/sidebar.e2e.ts
similarity index 100%
rename from e2e/playwright/navigation/src/tests/sidebar.spec.ts
rename to e2e/playwright/navigation/src/tests/sidebar.e2e.ts
diff --git a/e2e/playwright/navigation/src/tests/single-click.spec.ts b/e2e/playwright/navigation/src/tests/single-click.e2e.ts
similarity index 100%
rename from e2e/playwright/navigation/src/tests/single-click.spec.ts
rename to e2e/playwright/navigation/src/tests/single-click.e2e.ts
diff --git a/e2e/playwright/pagination/src/tests/multiple-pages-files.spec.ts b/e2e/playwright/pagination/src/tests/multiple-pages-files.e2e.ts
similarity index 100%
rename from e2e/playwright/pagination/src/tests/multiple-pages-files.spec.ts
rename to e2e/playwright/pagination/src/tests/multiple-pages-files.e2e.ts
diff --git a/e2e/playwright/search/src/tests/search-input.spec.ts b/e2e/playwright/search/src/tests/search-input.e2e.ts
similarity index 100%
rename from e2e/playwright/search/src/tests/search-input.spec.ts
rename to e2e/playwright/search/src/tests/search-input.e2e.ts
diff --git a/e2e/playwright/search/src/tests/search-results-files-folders.spec.ts b/e2e/playwright/search/src/tests/search-results-files-folders.e2e.ts
similarity index 100%
rename from e2e/playwright/search/src/tests/search-results-files-folders.spec.ts
rename to e2e/playwright/search/src/tests/search-results-files-folders.e2e.ts
diff --git a/e2e/playwright/search/src/tests/search-results-general.spec.ts b/e2e/playwright/search/src/tests/search-results-general.e2e.ts
similarity index 100%
rename from e2e/playwright/search/src/tests/search-results-general.spec.ts
rename to e2e/playwright/search/src/tests/search-results-general.e2e.ts
diff --git a/e2e/playwright/search/src/tests/search-results-libraries.spec.ts b/e2e/playwright/search/src/tests/search-results-libraries.e2e.ts
similarity index 100%
rename from e2e/playwright/search/src/tests/search-results-libraries.spec.ts
rename to e2e/playwright/search/src/tests/search-results-libraries.e2e.ts
diff --git a/e2e/playwright/search/src/tests/search-sorting.spec.ts b/e2e/playwright/search/src/tests/search-sorting.e2e.ts
similarity index 100%
rename from e2e/playwright/search/src/tests/search-sorting.spec.ts
rename to e2e/playwright/search/src/tests/search-sorting.e2e.ts
diff --git a/e2e/playwright/share-action/src/tests/share/share-file.spec.ts b/e2e/playwright/share-action/src/tests/share/share-file.e2e.ts
similarity index 100%
rename from e2e/playwright/share-action/src/tests/share/share-file.spec.ts
rename to e2e/playwright/share-action/src/tests/share/share-file.e2e.ts
diff --git a/e2e/playwright/share-action/src/tests/share/unshare-file-search-results.spec.ts b/e2e/playwright/share-action/src/tests/share/unshare-file-search-results.e2e.ts
similarity index 100%
rename from e2e/playwright/share-action/src/tests/share/unshare-file-search-results.spec.ts
rename to e2e/playwright/share-action/src/tests/share/unshare-file-search-results.e2e.ts
diff --git a/e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.spec.ts b/e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.e2e.ts
similarity index 100%
rename from e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.spec.ts
rename to e2e/playwright/special-permissions-actions-available/src/tests/folders-actions.e2e.ts
diff --git a/e2e/playwright/special-permissions-actions-available/src/tests/special-permissions-actions.test.ts b/e2e/playwright/special-permissions-actions-available/src/tests/special-permissions-actions.e2e.ts
similarity index 100%
rename from e2e/playwright/special-permissions-actions-available/src/tests/special-permissions-actions.test.ts
rename to e2e/playwright/special-permissions-actions-available/src/tests/special-permissions-actions.e2e.ts
diff --git a/e2e/playwright/viewer/src/tests/viewer-action.spec.ts b/e2e/playwright/viewer/src/tests/viewer-action.e2e.ts
similarity index 100%
rename from e2e/playwright/viewer/src/tests/viewer-action.spec.ts
rename to e2e/playwright/viewer/src/tests/viewer-action.e2e.ts
diff --git a/e2e/playwright/viewer/src/tests/viewer-protected.spec.ts b/e2e/playwright/viewer/src/tests/viewer-protected.e2e.ts
similarity index 100%
rename from e2e/playwright/viewer/src/tests/viewer-protected.spec.ts
rename to e2e/playwright/viewer/src/tests/viewer-protected.e2e.ts
diff --git a/e2e/playwright/viewer/src/tests/viewer-useraction.spec.ts b/e2e/playwright/viewer/src/tests/viewer-useraction.e2e.ts
similarity index 100%
rename from e2e/playwright/viewer/src/tests/viewer-useraction.spec.ts
rename to e2e/playwright/viewer/src/tests/viewer-useraction.e2e.ts
diff --git a/e2e/playwright/viewer/src/tests/viewer.spec.ts b/e2e/playwright/viewer/src/tests/viewer.e2e.ts
similarity index 100%
rename from e2e/playwright/viewer/src/tests/viewer.spec.ts
rename to e2e/playwright/viewer/src/tests/viewer.e2e.ts
diff --git a/projects/aca-playwright-shared/src/base-config/playwright.config.ts b/projects/aca-playwright-shared/src/base-config/playwright.config.ts
index 928870680..0c207b474 100644
--- a/projects/aca-playwright-shared/src/base-config/playwright.config.ts
+++ b/projects/aca-playwright-shared/src/base-config/playwright.config.ts
@@ -50,6 +50,7 @@ export const getGlobalConfig: PlaywrightTestConfig = {
   workers: 3,
   reporter: [['list'], ...report],
   globalSetup: require.resolve('./global.setup'),
+  testMatch: ['**/*.e2e.ts'],
   use: {
     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
     actionTimeout: 0,