Issue #22854: Merge test fix from 3.5