(PUP-3338) Allow specs to pass on 1.8.7