Fix tests against 1.8.7