Fix tests broken in 680a0c8.