Fix broken 1.8.7 tests on Travis