Make the tests work with 1.9

Mainly because of our crippled amazon instance :-)