Issue #28815: Merge test tweak from 3.5