Fix test breakage from r221386