We're not using 1.8.7 on VMs anymore, test on 1.9.3 and 2.0.0