diff --git a/test/appium/tests/critical/chats/test_1_1_public_chats.py b/test/appium/tests/critical/chats/test_1_1_public_chats.py
index 35f521a4bc..56b9dde28f 100644
--- a/test/appium/tests/critical/chats/test_1_1_public_chats.py
+++ b/test/appium/tests/critical/chats/test_1_1_public_chats.py
@@ -9,7 +9,7 @@ from views.sign_in_view import SignInView
 import pytest
 
 
-@pytest.mark.xdist_group(name="commands_2")
+@pytest.mark.xdist_group(name="four_2")
 @marks.critical
 class TestCommandsMultipleDevicesMerged(MultipleSharedDeviceTestCase):
 
@@ -208,7 +208,7 @@ class TestCommandsMultipleDevicesMerged(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
 
-@pytest.mark.xdist_group(name="1_1_chat_2")
+@pytest.mark.xdist_group(name="one_2")
 @marks.critical
 class TestOneToOneChatMultipleSharedDevices(MultipleSharedDeviceTestCase):
 
@@ -600,7 +600,7 @@ class TestOneToOneChatMultipleSharedDevices(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
 
-@pytest.mark.xdist_group(name="chats_contacts_keycard_2")
+@pytest.mark.xdist_group(name="two_2")
 @marks.critical
 class TestContactBlockMigrateKeycardMultipleSharedDevices(MultipleSharedDeviceTestCase):
 
@@ -940,7 +940,7 @@ class TestContactBlockMigrateKeycardMultipleSharedDevices(MultipleSharedDeviceTe
         self.errors.verify_no_errors()
 
 
-@pytest.mark.xdist_group(name="ens_stickers_mention_2")
+@pytest.mark.xdist_group(name="three_2")
 @marks.critical
 class TestEnsStickersMultipleDevicesMerged(MultipleSharedDeviceTestCase):
 
diff --git a/test/appium/tests/critical/chats/test_group_chat.py b/test/appium/tests/critical/chats/test_group_chat.py
index ca6d97a2a4..66739ffbaa 100644
--- a/test/appium/tests/critical/chats/test_group_chat.py
+++ b/test/appium/tests/critical/chats/test_group_chat.py
@@ -5,7 +5,7 @@ from views.sign_in_view import SignInView
 from views.chat_view import ChatView
 
 
-@pytest.mark.xdist_group(name="group_chat_3")
+@pytest.mark.xdist_group(name="one_3")
 @marks.critical
 class TestGroupChatMultipleDeviceMerged(MultipleSharedDeviceTestCase):
 
diff --git a/test/appium/tests/critical/onboarding/test_onboarding_flows.py b/test/appium/tests/critical/onboarding/test_onboarding_flows.py
index afeeb9d916..090ded6315 100644
--- a/test/appium/tests/critical/onboarding/test_onboarding_flows.py
+++ b/test/appium/tests/critical/onboarding/test_onboarding_flows.py
@@ -8,7 +8,7 @@ from views.sign_in_view import SignInView
 from tests.users import basic_user, transaction_senders
 
 
-@pytest.mark.xdist_group(name="onboarding_1")
+@pytest.mark.xdist_group(name="one_1")
 @marks.critical
 class TestOnboardingOneDeviceMerged(MultipleSharedDeviceTestCase):
 
@@ -223,7 +223,7 @@ class TestOnboardingOneDeviceMerged(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
 
-@pytest.mark.xdist_group(name="restore_1")
+@pytest.mark.xdist_group(name="two_1")
 @marks.critical
 class TestRestoreOneDeviceMerged(MultipleSharedDeviceTestCase):
     @classmethod
diff --git a/test/appium/tests/critical/test_pairing_devices_sync.py b/test/appium/tests/critical/test_pairing_devices_sync.py
index d163f75f17..9937746941 100644
--- a/test/appium/tests/critical/test_pairing_devices_sync.py
+++ b/test/appium/tests/critical/test_pairing_devices_sync.py
@@ -88,7 +88,7 @@ class TestPairingMultipleDevicesMerged(MultipleSharedDeviceTestCase):
         self.profile_2.get_back_to_home_view()
 
 
-@pytest.mark.xdist_group(name="sync_2")
+@pytest.mark.xdist_group(name="five_2")
 @marks.critical
 class TestPairingSyncMultipleDevicesMerged(MultipleSharedDeviceTestCase):
 
diff --git a/test/appium/tests/critical/test_public_chat_browsing.py b/test/appium/tests/critical/test_public_chat_browsing.py
index c74642d4ee..d531eba32e 100644
--- a/test/appium/tests/critical/test_public_chat_browsing.py
+++ b/test/appium/tests/critical/test_public_chat_browsing.py
@@ -11,7 +11,7 @@ from views.sign_in_view import SignInView
 from selenium.common.exceptions import NoSuchElementException
 
 
-@pytest.mark.xdist_group(name="public_chat_2")
+@pytest.mark.xdist_group(name="one_2")
 @marks.critical
 class TestPublicChatMultipleDeviceMerged(MultipleSharedDeviceTestCase):
 
@@ -225,7 +225,7 @@ class TestPublicChatMultipleDeviceMerged(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
 
-@pytest.mark.xdist_group(name="public_chat_browser_1")
+@pytest.mark.xdist_group(name="three_1")
 @marks.critical
 class TestPublicChatBrowserOneDeviceMerged(MultipleSharedDeviceTestCase):
 
diff --git a/test/appium/tests/critical/wallet_and_tx/test_send_tx_dapp_keycard.py b/test/appium/tests/critical/wallet_and_tx/test_send_tx_dapp_keycard.py
index d97a19002d..80e5cf9e11 100644
--- a/test/appium/tests/critical/wallet_and_tx/test_send_tx_dapp_keycard.py
+++ b/test/appium/tests/critical/wallet_and_tx/test_send_tx_dapp_keycard.py
@@ -9,7 +9,7 @@ from tests.users import transaction_senders, basic_user, wallet_users, ens_user_
 from views.sign_in_view import SignInView
 
 
-@pytest.mark.xdist_group(name="send_tx_1")
+@pytest.mark.xdist_group(name="one_1")
 @marks.critical
 class TestSendTxDeviceMerged(MultipleSharedDeviceTestCase):
     @classmethod
@@ -264,7 +264,7 @@ class TestSendTxDeviceMerged(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
 
-@pytest.mark.xdist_group(name="keycard_tx_1")
+@pytest.mark.xdist_group(name="two_1")
 @marks.critical
 class TestKeycardTxOneDeviceMerged(MultipleSharedDeviceTestCase):
     @classmethod
diff --git a/test/appium/tests/critical/wallet_and_tx/test_wallet.py b/test/appium/tests/critical/wallet_and_tx/test_wallet.py
index a0d84244ae..aa1a77b12b 100644
--- a/test/appium/tests/critical/wallet_and_tx/test_wallet.py
+++ b/test/appium/tests/critical/wallet_and_tx/test_wallet.py
@@ -9,7 +9,7 @@ from views.sign_in_view import SignInView
 from support.utilities import get_merged_txs_list
 
 
-@pytest.mark.xdist_group(name="wallet_management_1")
+@pytest.mark.xdist_group(name="three_1")
 @marks.critical
 class TestWalletManagementDeviceMerged(MultipleSharedDeviceTestCase):
 
diff --git a/test/appium/tests/medium/chats/test_chats.py b/test/appium/tests/medium/chats/test_chats.py
index 46527f9386..9d6b7bb794 100644
--- a/test/appium/tests/medium/chats/test_chats.py
+++ b/test/appium/tests/medium/chats/test_chats.py
@@ -9,7 +9,7 @@ from tests.base_test_case import create_shared_drivers, MultipleSharedDeviceTest
 from views.sign_in_view import SignInView
 
 
-@pytest.mark.xdist_group(name="public_chat_medium_2")
+@pytest.mark.xdist_group(name="two_2")
 @marks.medium
 class TestPublicChatMultipleDeviceMergedMedium(MultipleSharedDeviceTestCase):
     @classmethod
@@ -134,7 +134,7 @@ class TestPublicChatMultipleDeviceMergedMedium(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
 
-@pytest.mark.xdist_group(name="chat_medium_2")
+@pytest.mark.xdist_group(name="three_2")
 @marks.medium
 class TestChatMultipleDevice(MultipleSharedDeviceTestCase):
 
@@ -540,7 +540,7 @@ class TestChatMultipleDevice(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
 
-@pytest.mark.xdist_group(name="group_chat_medium_3")
+@pytest.mark.xdist_group(name="one_3")
 @marks.medium
 class TestGroupChatMultipleDevice(MultipleSharedDeviceTestCase):
     @classmethod
diff --git a/test/appium/tests/medium/test_browser_profile.py b/test/appium/tests/medium/test_browser_profile.py
index 66d827bb03..3be70466da 100644
--- a/test/appium/tests/medium/test_browser_profile.py
+++ b/test/appium/tests/medium/test_browser_profile.py
@@ -6,7 +6,7 @@ from views.sign_in_view import SignInView
 from tests.users import basic_user, ens_user, ens_user_ropsten, transaction_senders, chat_users
 
 
-@pytest.mark.xdist_group(name="browser_profile_medium_1")
+@pytest.mark.xdist_group(name="one_1")
 @marks.medium
 class TestBrowserProfileOneDevice(MultipleSharedDeviceTestCase):
 
diff --git a/test/appium/tests/medium/test_deeplink_chat_share_profile.py b/test/appium/tests/medium/test_deeplink_chat_share_profile.py
index df0922372c..6d33810a50 100644
--- a/test/appium/tests/medium/test_deeplink_chat_share_profile.py
+++ b/test/appium/tests/medium/test_deeplink_chat_share_profile.py
@@ -16,7 +16,7 @@ from views.chat_view import ChatView
 from views.sign_in_view import SignInView
 
 
-@pytest.mark.xdist_group(name="deeplink_chat_profile_medium_1")
+@pytest.mark.xdist_group(name="two_1")
 @marks.medium
 class TestDeeplinkChatProfileOneDevice(MultipleSharedDeviceTestCase):