Run 1.8.7 and 2.1.2 first test edges first
Use patch until new gem is cut.