buildbot fix multiVersion tests, future-proof