Adjust gem dependencies so specs pass on 1.8