Fixup test case after r217079