making tests run on 1.8.7 again