Yet another fix for 1.8.7 tests