Fix tests broken by #206e1af.