Drop 1.8.7 and test against 2.0.0 #3