Fix tests on 1.8.7