make tests pass under 1.8.7