Failing tests for #5165 -- follow up to #5139 (fixed itself with #5140)