Issue #16115: Merge test skip from 3.3.