Make specs pass on 1.8.7