Support 2.1.1 and fix test to fail in 1.8.7