diff --git a/tests/cypress.json b/tests/cypress.json
index dd68e5fc..24a6ba3f 100644
--- a/tests/cypress.json
+++ b/tests/cypress.json
@@ -9,5 +9,5 @@
     "email": "admin@localhost.company",
     "password": "12qwaszx"
   },
-  "testFiles": ["auth_page.js", "actions_tasks_objects/*", "actions_users/*", "remove_users_tasks.js"]
+  "testFiles": ["auth_page.js", "actions_tasks_objects/*", "actions_users/**/*", "remove_users_tasks.js"]
 }
diff --git a/tests/cypress/integration/actions_users/case_1_create_delete_task.js b/tests/cypress/integration/actions_tasks_objects/case_1_create_delete_task.js
similarity index 100%
rename from tests/cypress/integration/actions_users/case_1_create_delete_task.js
rename to tests/cypress/integration/actions_tasks_objects/case_1_create_delete_task.js
diff --git a/tests/cypress/integration/actions_users/case_2_register_user_change_pass.js b/tests/cypress/integration/actions_users/registration_involved/case_2_register_user_change_pass.js
similarity index 98%
rename from tests/cypress/integration/actions_users/case_2_register_user_change_pass.js
rename to tests/cypress/integration/actions_users/registration_involved/case_2_register_user_change_pass.js
index c0bb0a7a..91b025c1 100644
--- a/tests/cypress/integration/actions_users/case_2_register_user_change_pass.js
+++ b/tests/cypress/integration/actions_users/registration_involved/case_2_register_user_change_pass.js
@@ -13,7 +13,7 @@ const randomString = (isPassword) => {
     return isPassword ? `${result}${Math.floor(Math.random() * 10)}` : result;
 };
 
-context('Register user, change password, login with new password', { browser: 'chrome' }, () => {
+context('Register user, change password, login with new password', () => {
     const caseId = '2';
     const firstName = `${randomString()}`;
     const lastName = `${randomString()}`;
diff --git a/tests/cypress/integration/actions_users/case_4_assign_taks_job_users.js b/tests/cypress/integration/actions_users/registration_involved/case_4_assign_taks_job_users.js
similarity index 98%
rename from tests/cypress/integration/actions_users/case_4_assign_taks_job_users.js
rename to tests/cypress/integration/actions_users/registration_involved/case_4_assign_taks_job_users.js
index b11c3764..72a678b2 100644
--- a/tests/cypress/integration/actions_users/case_4_assign_taks_job_users.js
+++ b/tests/cypress/integration/actions_users/registration_involved/case_4_assign_taks_job_users.js
@@ -4,7 +4,7 @@
 
 /// <reference types="cypress" />
 
-context('Multiple users. Assign task, job.', { browser: 'chrome' }, () => {
+context('Multiple users. Assign task, job.', () => {
     const caseId = '4';
     const labelName = `Case ${caseId}`;
     const taskName = `New annotation task for ${labelName}`;
diff --git a/tests/cypress/integration/actions_users/issue_1599_ch_user_registration.js b/tests/cypress/integration/actions_users/registration_involved/issue_1599_ch_user_registration.js
similarity index 85%
rename from tests/cypress/integration/actions_users/issue_1599_ch_user_registration.js
rename to tests/cypress/integration/actions_users/registration_involved/issue_1599_ch_user_registration.js
index 92db957e..bbcb5db7 100644
--- a/tests/cypress/integration/actions_users/issue_1599_ch_user_registration.js
+++ b/tests/cypress/integration/actions_users/registration_involved/issue_1599_ch_user_registration.js
@@ -4,13 +4,12 @@
 
 /// <reference types="cypress" />
 
-context('Issue 1599 (Chinese alphabet).', { browser: 'chrome' }, () => {
-
-    const firstName = '测试者'
-    const lastName = '测试'
-    const userName = 'Testuser_ch'
-    const email = 'Testuser_ch@local.local'
-    const password = 'Qwerty123!'
+context('Issue 1599 (Chinese alphabet).', () => {
+    const firstName = '测试者';
+    const lastName = '测试';
+    const userName = 'Testuser_ch';
+    const email = 'Testuser_ch@local.local';
+    const password = 'Qwerty123!';
 
     before(() => {
         cy.visit('auth/register');
diff --git a/tests/cypress/integration/actions_users/issue_1599_pl_user_registration.js b/tests/cypress/integration/actions_users/registration_involved/issue_1599_pl_user_registration.js
similarity index 85%
rename from tests/cypress/integration/actions_users/issue_1599_pl_user_registration.js
rename to tests/cypress/integration/actions_users/registration_involved/issue_1599_pl_user_registration.js
index 53b169f7..2ee411d9 100644
--- a/tests/cypress/integration/actions_users/issue_1599_pl_user_registration.js
+++ b/tests/cypress/integration/actions_users/registration_involved/issue_1599_pl_user_registration.js
@@ -4,13 +4,12 @@
 
 /// <reference types="cypress" />
 
-context('Issue 1599 (Polish alphabet).', { browser: 'chrome' }, () => {
-
-    const firstName = 'Świętobor'
-    const lastName = 'Сzcić'
-    const userName = 'Testuser_pl'
-    const email = 'Testuser_pl@local.local'
-    const password = 'Qwerty123!'
+context('Issue 1599 (Polish alphabet).', () => {
+    const firstName = 'Świętobor';
+    const lastName = 'Сzcić';
+    const userName = 'Testuser_pl';
+    const email = 'Testuser_pl@local.local';
+    const password = 'Qwerty123!';
 
     before(() => {
         cy.visit('auth/register');
diff --git a/tests/cypress/integration/actions_users/check_email_verification_system.js b/tests/cypress/integration/email_system/check_email_verification_system.js
similarity index 86%
rename from tests/cypress/integration/actions_users/check_email_verification_system.js
rename to tests/cypress/integration/email_system/check_email_verification_system.js
index a4576c3c..8ff33b1b 100644
--- a/tests/cypress/integration/actions_users/check_email_verification_system.js
+++ b/tests/cypress/integration/email_system/check_email_verification_system.js
@@ -13,7 +13,7 @@ const randomString = (isPassword) => {
     return isPassword ? `${result}${Math.floor(Math.random() * 10)}` : result;
 };
 
-context('Check email verification system', { browser: 'firefox' }, () => {
+context('Check email verification system', () => {
     const caseId = 'Email verification system';
     const firstName = `${randomString()}`;
     const lastName = `${randomString()}`;
@@ -31,8 +31,8 @@ context('Check email verification system', { browser: 'firefox' }, () => {
             cy.server().route('POST', '/api/v1/auth/register').as('userRegister');
             cy.userRegistration(firstName, lastName, userName, emailAddr, password);
             cy.get('.ant-notification-topRight')
-            .contains(`We have sent an email with a confirmation link to ${emailAddr}.`)
-            .should('exist')
+                .contains(`We have sent an email with a confirmation link to ${emailAddr}.`)
+                .should('exist');
             cy.wait('@userRegister').its('status').should('eq', 201);
         });
     });
diff --git a/tests/cypress_cron_type.json b/tests/cypress_cron_type.json
new file mode 100644
index 00000000..40a1b2b5
--- /dev/null
+++ b/tests/cypress_cron_type.json
@@ -0,0 +1,13 @@
+{
+  "video": false,
+  "baseUrl": "http://localhost:8080",
+  "viewportWidth": 1300,
+  "viewportHeight": 960,
+  "defaultCommandTimeout": 25000,
+  "env": {
+    "user": "admin",
+    "email": "admin@localhost.company",
+    "password": "12qwaszx"
+  },
+  "testFiles": ["auth_page.js", "actions_tasks_objects/*", "actions_users/*", "email_system/*", "remove_users_tasks.js"]
+}
diff --git a/tests/package.json b/tests/package.json
index 2b38c570..746be871 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -1,7 +1,7 @@
 {
   "scripts": {
     "cypress:run:chrome": "cypress run --env coverage=false --headless --browser chrome",
-    "cypress:run:firefox": "cypress run --env coverage=false --headless --browser firefox"
+    "cypress:run:firefox": "cypress run --env coverage=false --headless --browser firefox --config-file cypress_cron_type.json"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.8.1",