Fixed buildbot tests, after 242c085