diff --git a/.github/workflows/unit-test-shards.json b/.github/workflows/unit-test-shards.json
index 2c1ffd4744b7..02a83a4ceb3a 100644
--- a/.github/workflows/unit-test-shards.json
+++ b/.github/workflows/unit-test-shards.json
@@ -2,168 +2,169 @@
   "lms-1": {
     "settings": "lms.envs.test",
     "paths": [
-      "lms/djangoapps/branding/",
-      "lms/djangoapps/bulk_email/",
-      "lms/djangoapps/bulk_enroll/",
-      "lms/djangoapps/bulk_user_retirement/",
-      "lms/djangoapps/ccx/",
-      "lms/djangoapps/certificates/",
-      "lms/djangoapps/commerce/"
+      "lms/djangoapps/discussion/rest_api/"
     ]
   },
   "lms-2": {
     "settings": "lms.envs.test",
     "paths": [
+      "lms/djangoapps/ccx/",
+      "lms/djangoapps/commerce/",
       "lms/djangoapps/course_api/",
-      "lms/djangoapps/course_blocks/",
-      "lms/djangoapps/course_goals/",
-      "lms/djangoapps/course_home_api/",
       "lms/djangoapps/course_wiki/",
-      "lms/djangoapps/coursewarehistoryextended/",
-      "lms/djangoapps/debug/"
+      "lms/djangoapps/discussion/notification_prefs/",
+      "lms/djangoapps/instructor_task/",
+      "lms/djangoapps/ora_staff_grader/",
+      "lms/djangoapps/survey/",
+      "lms/djangoapps/teams/",
+      "lms/djangoapps/verify_student/"
     ]
   },
   "lms-3": {
     "settings": "lms.envs.test",
     "paths": [
-      "lms/djangoapps/courseware/"
+      "lms/djangoapps/branding/",
+      "lms/djangoapps/bulk_enroll/",
+      "lms/djangoapps/courseware/",
+      "lms/djangoapps/instructor_analytics/",
+      "lms/djangoapps/learner_dashboard/",
+      "lms/djangoapps/lti_provider/",
+      "lms/djangoapps/program_enrollments/"
     ]
   },
   "lms-4": {
     "settings": "lms.envs.test",
     "paths": [
-      "lms/djangoapps/discussion/",
-      "lms/djangoapps/edxnotes/",
-      "lms/djangoapps/experiments/"
-    ]
-  },
-  "lms-5": {
-    "settings": "lms.envs.test",
-    "paths": [
-      "lms/djangoapps/gating/",
+      "lms/djangoapps/bulk_user_retirement/",
+      "lms/djangoapps/course_blocks/",
+      "lms/djangoapps/course_goals/",
+      "lms/djangoapps/course_home_api/",
+      "lms/djangoapps/coursewarehistoryextended/",
+      "lms/djangoapps/discussion/tests/",
+      "lms/djangoapps/experiments/",
       "lms/djangoapps/grades/",
       "lms/djangoapps/instructor/",
-      "lms/djangoapps/instructor_analytics/"
+      "lms/djangoapps/mfe_config_api/",
+      "lms/djangoapps/staticbook/",
+      "lms/lib/"
     ]
   },
-  "lms-6": {
+  "lms-5": {
     "settings": "lms.envs.test",
     "paths": [
-      "lms/djangoapps/instructor_task/",
-      "lms/djangoapps/learner_dashboard/",
+      "lms/djangoapps/bulk_email/",
+      "lms/djangoapps/certificates/",
+      "lms/djangoapps/debug/",
+      "lms/djangoapps/discussion/django_comment_client/",
+      "lms/djangoapps/edxnotes/",
+      "lms/djangoapps/gating/",
       "lms/djangoapps/learner_home/",
       "lms/djangoapps/lms_initialization/",
       "lms/djangoapps/lms_xblock/",
-      "lms/djangoapps/lti_provider/",
       "lms/djangoapps/mailing/",
       "lms/djangoapps/mobile_api/",
       "lms/djangoapps/monitoring/",
-      "lms/djangoapps/ora_staff_grader/",
-      "lms/djangoapps/program_enrollments/",
       "lms/djangoapps/rss_proxy/",
       "lms/djangoapps/static_template_view/",
-      "lms/djangoapps/staticbook/",
       "lms/djangoapps/support/",
-      "lms/djangoapps/survey/",
-      "lms/djangoapps/teams/",
       "lms/djangoapps/tests/",
       "lms/djangoapps/user_tours/",
-      "lms/djangoapps/verify_student/",
-      "lms/djangoapps/mfe_config_api/",
       "lms/envs/",
-      "lms/lib/",
       "lms/tests.py"
     ]
   },
-  "openedx-1-with-lms": {
+  "shared-with-lms-1": {
     "settings": "lms.envs.test",
     "paths": [
-      "openedx/core/djangoapps/ace_common/",
-      "openedx/core/djangoapps/cors_csrf/",
+      "common/djangoapps/",
       "openedx/core/djangoapps/agreements/",
       "openedx/core/djangoapps/api_admin/",
+      "openedx/core/djangoapps/authz/",
+      "openedx/core/djangoapps/cache_toolbox/",
+      "openedx/core/djangoapps/ccxcon/",
+      "openedx/core/djangoapps/content/",
+      "openedx/core/djangoapps/content_libraries/",
+      "openedx/core/djangoapps/course_apps/",
+      "openedx/core/djangoapps/credentials/",
+      "openedx/core/djangoapps/credit/",
+      "openedx/core/djangoapps/dark_lang/",
+      "openedx/core/djangoapps/django_comment_common/",
+      "openedx/core/djangoapps/embargo/",
+      "openedx/core/djangoapps/header_control/",
+      "openedx/core/djangoapps/heartbeat/",
+      "openedx/core/djangoapps/models/",
+      "openedx/core/djangoapps/notifications/",
+      "openedx/core/djangoapps/oauth_dispatch/",
+      "openedx/core/djangoapps/safe_sessions/",
+      "openedx/core/djangoapps/schedules/",
+      "openedx/core/djangoapps/user_api/",
+      "openedx/core/djangoapps/util/",
+      "openedx/core/djangoapps/video_pipeline/",
+      "openedx/core/djangoapps/waffle_utils/",
+      "openedx/core/djangoapps/xblock/",
+      "openedx/core/tests/",
+      "openedx/features/",
+      "openedx/tests/"
+    ]
+  },
+  "shared-with-lms-2": {
+    "settings": "lms.envs.test",
+    "paths": [
+      "openedx/core/djangoapps/ace_common/",
       "openedx/core/djangoapps/auth_exchange/",
       "openedx/core/djangoapps/bookmarks/",
-      "openedx/core/djangoapps/cache_toolbox/",
       "openedx/core/djangoapps/catalog/",
-      "openedx/core/djangoapps/ccxcon/",
       "openedx/core/djangoapps/commerce/",
       "openedx/core/djangoapps/common_initialization/",
       "openedx/core/djangoapps/common_views/",
       "openedx/core/djangoapps/config_model_utils/",
-      "openedx/core/djangoapps/content/",
-      "openedx/core/djangoapps/content_libraries/",
       "openedx/core/djangoapps/contentserver/",
       "openedx/core/djangoapps/cookie_metadata/",
-      "openedx/core/djangoapps/course_apps/",
+      "openedx/core/djangoapps/cors_csrf/",
       "openedx/core/djangoapps/course_date_signals/",
       "openedx/core/djangoapps/course_groups/",
+      "openedx/core/djangoapps/course_live/",
       "openedx/core/djangoapps/courseware_api/",
       "openedx/core/djangoapps/crawlers/",
-      "openedx/core/djangoapps/credentials/",
-      "openedx/core/djangoapps/credit/",
-      "openedx/core/djangoapps/course_live/",
-      "openedx/core/djangoapps/dark_lang/",
       "openedx/core/djangoapps/debug/",
       "openedx/core/djangoapps/discussions/",
-      "openedx/core/djangoapps/django_comment_common/",
-      "openedx/core/djangoapps/embargo/",
       "openedx/core/djangoapps/enrollments/",
-      "openedx/core/djangoapps/external_user_ids/"
-    ]
-  },
-  "openedx-2-with-lms": {
-    "settings": "lms.envs.test",
-    "paths": [
+      "openedx/core/djangoapps/external_user_ids/",
       "openedx/core/djangoapps/geoinfo/",
-      "openedx/core/djangoapps/header_control/",
-      "openedx/core/djangoapps/heartbeat/",
       "openedx/core/djangoapps/lang_pref/",
-      "openedx/core/djangoapps/models/",
       "openedx/core/djangoapps/monkey_patch/",
-      "openedx/core/djangoapps/notifications/",
-      "openedx/core/djangoapps/oauth_dispatch/",
       "openedx/core/djangoapps/olx_rest_api/",
       "openedx/core/djangoapps/password_policy/",
       "openedx/core/djangoapps/plugin_api/",
       "openedx/core/djangoapps/plugins/",
       "openedx/core/djangoapps/profile_images/",
       "openedx/core/djangoapps/programs/",
-      "openedx/core/djangoapps/safe_sessions/",
-      "openedx/core/djangoapps/schedules/",
       "openedx/core/djangoapps/service_status/",
       "openedx/core/djangoapps/session_inactivity_timeout/",
       "openedx/core/djangoapps/signals/",
       "openedx/core/djangoapps/site_configuration/",
       "openedx/core/djangoapps/system_wide_roles/",
       "openedx/core/djangoapps/theming/",
-      "openedx/core/djangoapps/user_api/",
       "openedx/core/djangoapps/user_authn/",
-      "openedx/core/djangoapps/util/",
       "openedx/core/djangoapps/verified_track_content/",
       "openedx/core/djangoapps/video_config/",
-      "openedx/core/djangoapps/video_pipeline/",
-      "openedx/core/djangoapps/waffle_utils/",
-      "openedx/core/djangoapps/xblock/",
       "openedx/core/djangoapps/xmodule_django/",
       "openedx/core/djangoapps/zendesk_proxy/",
-      "openedx/core/djangoapps/authz/",
       "openedx/core/djangolib/",
       "openedx/core/lib/",
-      "openedx/core/tests/",
-      "openedx/features/",
       "openedx/testing/",
-      "openedx/tests/"
+      "xmodule/"
     ]
   },
-  "openedx-1-with-cms": {
+  "shared-with-cms-1": {
     "settings": "cms.envs.test",
     "paths": [
+      "common/djangoapps/",
       "openedx/core/djangoapps/ace_common/",
-      "openedx/core/djangoapps/cors_csrf/",
       "openedx/core/djangoapps/agreements/",
       "openedx/core/djangoapps/api_admin/",
       "openedx/core/djangoapps/auth_exchange/",
+      "openedx/core/djangoapps/authz/",
       "openedx/core/djangoapps/bookmarks/",
       "openedx/core/djangoapps/cache_toolbox/",
       "openedx/core/djangoapps/catalog/",
@@ -175,8 +176,10 @@
       "openedx/core/djangoapps/content/",
       "openedx/core/djangoapps/content_libraries/",
       "openedx/core/djangoapps/content_staging/",
+      "openedx/core/djangoapps/content_tagging/",
       "openedx/core/djangoapps/contentserver/",
       "openedx/core/djangoapps/cookie_metadata/",
+      "openedx/core/djangoapps/cors_csrf/",
       "openedx/core/djangoapps/course_apps/",
       "openedx/core/djangoapps/course_date_signals/",
       "openedx/core/djangoapps/course_groups/",
@@ -190,13 +193,7 @@
       "openedx/core/djangoapps/django_comment_common/",
       "openedx/core/djangoapps/embargo/",
       "openedx/core/djangoapps/enrollments/",
-      "openedx/core/djangoapps/external_user_ids/"
-    ]
-  },
-  "openedx-2-with-cms": {
-    "settings": "cms.envs.test",
-    "paths": [
-      "openedx/core/djangoapps/content_tagging/",
+      "openedx/core/djangoapps/external_user_ids/",
       "openedx/core/djangoapps/geoinfo/",
       "openedx/core/djangoapps/header_control/",
       "openedx/core/djangoapps/heartbeat/",
@@ -228,9 +225,9 @@
       "openedx/core/djangoapps/xblock/",
       "openedx/core/djangoapps/xmodule_django/",
       "openedx/core/djangoapps/zendesk_proxy/",
-      "openedx/core/djangoapps/authz/",
       "openedx/core/lib/",
-      "openedx/tests/"
+      "openedx/tests/",
+      "xmodule/"
     ]
   },
   "cms-1": {
@@ -238,44 +235,15 @@
     "paths": [
       "cms/djangoapps/api/",
       "cms/djangoapps/cms_user_tasks/",
+      "cms/djangoapps/contentstore/",
       "cms/djangoapps/course_creators/",
       "cms/djangoapps/export_course_metadata/",
-      "cms/djangoapps/modulestore_migrator/",
       "cms/djangoapps/models/",
+      "cms/djangoapps/modulestore_migrator/",
       "cms/djangoapps/pipeline_js/",
       "cms/djangoapps/xblock_config/",
       "cms/envs/",
       "cms/lib/"
     ]
-  },
-  "cms-2": {
-    "settings": "cms.envs.test",
-    "paths": [
-      "cms/djangoapps/contentstore/"
-    ]
-  },
-  "common-with-lms": {
-    "settings": "lms.envs.test",
-    "paths": [
-      "common/djangoapps/"
-    ]
-  },
-  "common-with-cms": {
-    "settings": "cms.envs.test",
-    "paths": [
-      "common/djangoapps/"
-    ]
-  },
-  "xmodule-with-lms": {
-    "settings": "lms.envs.test",
-    "paths": [
-      "xmodule/"
-    ]
-  },
-  "xmodule-with-cms": {
-    "settings": "cms.envs.test",
-    "paths": [
-      "xmodule/"
-    ]
   }
 }
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 7b7b14a43e88..4345130f9600 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -25,25 +25,16 @@ jobs:
           - "3.12"
         django-version:
           - "pinned"
-        # When updating the shards, remember to make the same changes in
-        # .github/workflows/unit-tests-gh-hosted.yml
         shard_name:
           - "lms-1"
           - "lms-2"
           - "lms-3"
           - "lms-4"
           - "lms-5"
-          - "lms-6"
-          - "openedx-1-with-lms"
-          - "openedx-2-with-lms"
-          - "openedx-1-with-cms"
-          - "openedx-2-with-cms"
+          - "shared-with-lms-1"
+          - "shared-with-lms-2"
+          - "shared-with-cms-1"
           - "cms-1"
-          - "cms-2"
-          - "common-with-lms"
-          - "common-with-cms"
-          - "xmodule-with-lms"
-          - "xmodule-with-cms"
         mongo-version:
           - "7.0"
         os-version:
@@ -119,7 +110,16 @@ jobs:
       - name: run tests
         shell: bash
         run: |
-          python -Wd -m pytest -p no:randomly --ds=${{ env.settings_path }} ${{ env.unit_test_paths }} --cov=.
+          python -Wd -m pytest -p no:randomly --ds=${{ env.settings_path }} ${{ env.unit_test_paths }} --cov=. \
+            --report-log=reports/pytest-report-${{ matrix.shard_name }}.jsonl
+
+      - name: Upload pytest timing report
+        if: always()
+        uses: actions/upload-artifact@v7
+        with:
+          name: pytest-report-${{ matrix.shard_name }}-${{ matrix.python-version }}-${{ matrix.django-version }}-${{ matrix.mongo-version }}-${{ matrix.os-version }}
+          path: reports/pytest-report-${{ matrix.shard_name }}.jsonl
+          overwrite: true
 
       - name: rename warnings json file
         if: success()
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index f6f53b6041bb..c739333d766a 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1719,6 +1719,7 @@ pytest==8.2.0
     #   pytest-json-report
     #   pytest-metadata
     #   pytest-randomly
+    #   pytest-reportlog
     #   pytest-xdist
 pytest-attrib==0.1.3
     # via -r requirements/edx/testing.txt
@@ -1734,6 +1735,8 @@ pytest-metadata==3.1.1
     #   pytest-json-report
 pytest-randomly==4.0.1
     # via -r requirements/edx/testing.txt
+pytest-reportlog==1.0.0
+    # via -r requirements/edx/testing.txt
 pytest-xdist[psutil]==3.8.0
     # via -r requirements/edx/testing.txt
 python-dateutil==2.9.0.post0
diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in
index 9784cb6cc946..b84fd39e3cab 100644
--- a/requirements/edx/testing.in
+++ b/requirements/edx/testing.in
@@ -38,6 +38,7 @@ pytest-django             # Django support for pytest
 pytest-json-report        # Output json formatted warnings after running pytest
 pytest-metadata           # To prevent 'make upgrade' failure, dependency of pytest-json-report
 pytest-randomly           # pytest plugin to randomly order tests
+pytest-reportlog          # Per-test timing data including setup/teardown (used for shard rebalancing)
 pytest-xdist[psutil]      # Parallel execution of tests on multiple CPU cores or hosts
 singledispatch            # Backport of functools.singledispatch from Python 3.4+, used in tests of XBlock rendering
 testfixtures              # Provides a LogCapture utility used by several tests
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 5ce8448d174b..eee2e118e530 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1305,6 +1305,7 @@ pytest==8.2.0
     #   pytest-json-report
     #   pytest-metadata
     #   pytest-randomly
+    #   pytest-reportlog
     #   pytest-xdist
 pytest-attrib==0.1.3
     # via -r requirements/edx/testing.in
@@ -1320,6 +1321,8 @@ pytest-metadata==3.1.1
     #   pytest-json-report
 pytest-randomly==4.0.1
     # via -r requirements/edx/testing.in
+pytest-reportlog==1.0.0
+    # via -r requirements/edx/testing.in
 pytest-xdist[psutil]==3.8.0
     # via -r requirements/edx/testing.in
 python-dateutil==2.9.0.post0