diff --git a/ci/tests/Jenkinsfile.e2e-nightly b/ci/tests/Jenkinsfile.e2e-nightly
index d686c5de54..15d2ccd6d0 100644
--- a/ci/tests/Jenkinsfile.e2e-nightly
+++ b/ci/tests/Jenkinsfile.e2e-nightly
@@ -59,6 +59,7 @@ pipeline {
             sh """
               python3 -m pytest \
                 --numprocesses 9 \
+                --dist loadgroup \
                 --rerun_count=2 \
                 --testrail_report=True \
                 -m testrail_id \
diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs
index bf0f202b6e..1a1d711c0e 100644
--- a/ci/tests/Jenkinsfile.e2e-prs
+++ b/ci/tests/Jenkinsfile.e2e-prs
@@ -100,6 +100,7 @@ pipeline {
                 --numprocesses 9 \
                 --rerun_count=2 \
                 --testrail_report=True \
+                --dist loadgroup \
                 -m \"${params.TEST_MARKERS}\" \
                 -k \"${params.KEYWORD_EXPRESSION}\" \
                 --apk=${params.APK_NAME} \
diff --git a/test/appium/tests/conftest.py b/test/appium/tests/conftest.py
index 63fb4abc44..704cde68b1 100644
--- a/test/appium/tests/conftest.py
+++ b/test/appium/tests/conftest.py
@@ -292,6 +292,8 @@ def pytest_runtest_protocol(item, nextitem):
     for i in range(rerun_count):
         reports = runtestprotocol(item, nextitem=nextitem)
         for report in reports:
+            # is_in_group = [i for i in item.iter_markers(name='xdist_group')]
+            # if report.failed and should_rerun_test(report.longreprtext) and not is_in_group:
             if report.failed and should_rerun_test(report.longreprtext):
                 break  # rerun
         else: