1.5 compat (bug 874190)

i think this is good to go, if you want to run the tests locally ... be warned you might want to nuke your virtualenv to ensure it is up to date.