Fix tests for PR 18500, revisited