Followup #13779: Backwards-compatible unit test