Make tests compatible with 1.8.7.