Follow-up to r216380: update test expectations