Re #1165 - attempt to optimize saucelabs test speed...