diff --git a/.github/config/muted_ya.txt b/.github/config/muted_ya.txt
index 98f5c2046a9a..b5e595f69359 100644
--- a/.github/config/muted_ya.txt
+++ b/.github/config/muted_ya.txt
@@ -201,8 +201,6 @@ ydb/tests/functional/api test_discovery.py.TestDiscoveryExtEndpoint.test_scenari
 ydb/tests/functional/backup_collection basic_user_scenarios.py.TestBackupCollectionServiceObjectsRotation.test_service_schema_objects_cleanup_on_rotate
 ydb/tests/functional/backup_collection basic_user_scenarios.py.TestFullCycleLocalBackupRestoreWIncrComplSchemaChange.test_full_cycle_local_backup_restore_with_incrementals_complex_schema_changes
 ydb/tests/functional/backup_collection basic_user_scenarios.py.TestIncrementalChainRestoreAfterDeletion.test_incremental_chain_restore_when_tables_deleted
-ydb/tests/functional/blobstorage test_pdisk_slot_size_in_units.py.TestPDiskSlotSizeInUnits.test_change_group_size_in_units
-ydb/tests/functional/blobstorage test_pdisk_slot_size_in_units.py.TestPDiskSlotSizeInUnits.test_change_pdisk_slot_size_in_units
 ydb/tests/functional/config test_distconf.py.TestDistConfWithAuth.test_auth_v2_initialization
 ydb/tests/functional/config test_distconf_sentinel_node_status.py.TestKiKiMRDistConfSelfHealReassignNodeAfterReconfiguration.test_state_storage
 ydb/tests/functional/encryption test_encryption.py.TestEncryption.test_simple_encryption
diff --git a/ydb/tests/functional/blobstorage/test_pdisk_slot_size_in_units.py b/ydb/tests/functional/blobstorage/test_pdisk_slot_size_in_units.py
index 968c35a3796b..11052ba52883 100644
--- a/ydb/tests/functional/blobstorage/test_pdisk_slot_size_in_units.py
+++ b/ydb/tests/functional/blobstorage/test_pdisk_slot_size_in_units.py
@@ -55,6 +55,7 @@ def setup(self):
 
         self.pdisk_id = base_config.PDisk[1].PDiskId
         self.groups = [group for group in base_config.Group if group.StoragePoolId == 1]
+        self.groups.sort(key=lambda g: g.GroupId)
         assert len(self.groups) == 2
         for g in self.groups:
             assert len(g.VSlotId) == 1
@@ -114,6 +115,7 @@ def http_get(self, url):
     def get_storage_groups(self):
         response = self.http_get('/storage/groups?fields_required=all&with=all').json()
         groups = [group for group in response['StorageGroups'] if group['PoolName'] == self.pool_name]
+        groups.sort(key=lambda g: g['GroupId'])
         assert len(groups) == 2
         for group in groups:
             vdisk = group['VDisks'][0]
@@ -147,11 +149,12 @@ def wait_whiteboard_updated():
             self.check_group(groups[1], expected_vdisk_weight=1, expected_num_active_slots=3)
         self.retriable(wait_whiteboard_updated)
 
-        pdisk_info = self.get_pdisk_info()
-        logger.info(json.dumps(pdisk_info, indent=2))
-
-        self.check_pdisk(pdisk_info['Whiteboard']['PDisk'], expected_num_active_slots=3)
-        self.check_pdisk(pdisk_info['BSC']['PDisk'], expected_num_active_slots=3, expected_slot_size_in_units=0)
+        def wait_pdisk_info_updated():
+            pdisk_info = self.get_pdisk_info()
+            logger.info(json.dumps(pdisk_info, indent=2))
+            self.check_pdisk(pdisk_info['Whiteboard']['PDisk'], expected_num_active_slots=3)
+            self.check_pdisk(pdisk_info['BSC']['PDisk'], expected_num_active_slots=3, expected_slot_size_in_units=0)
+        self.retriable(wait_pdisk_info_updated)
 
     def test_change_pdisk_slot_size_in_units(self):
         self.change_pdisk_slot_size_in_units(slot_size_in_units=2)
@@ -164,8 +167,15 @@ def wait_whiteboard_updated():
             self.check_group(groups[1], expected_vdisk_weight=2, expected_num_active_slots=3)
         self.retriable(wait_whiteboard_updated)
 
-        pdisk_info = self.get_pdisk_info()
-        logger.info(json.dumps(pdisk_info, indent=2))
-
-        self.check_pdisk(pdisk_info['Whiteboard']['PDisk'], expected_num_active_slots=3)
-        self.check_pdisk(pdisk_info['BSC']['PDisk'], expected_num_active_slots=3, expected_slot_size_in_units=2)
+        def wait_bsc_updated():
+            base_config = self.cluster.client.query_base_config().BaseConfig
+            logger.info(base_config.PDisk[1])
+            assert base_config.PDisk[1].PDiskMetrics.SlotSizeInUnits == 2
+        self.retriable(wait_bsc_updated)
+
+        def wait_pdisk_info_updated():
+            pdisk_info = self.get_pdisk_info()
+            logger.info(json.dumps(pdisk_info, indent=2))
+            self.check_pdisk(pdisk_info['Whiteboard']['PDisk'], expected_num_active_slots=3)
+            self.check_pdisk(pdisk_info['BSC']['PDisk'], expected_num_active_slots=3, expected_slot_size_in_units=2)
+        self.retriable(wait_pdisk_info_updated)