Fix tests broken by c2eefa45bb137386a300bb5e254cac5912de10b6.