Refs #9436. Make test compatible with changes from #9564.