Build fix

Fixes #445

Travis and Codeship builds are running again and don't get aborted with errors.

While the recent build is red, it's generally OK - it's the old issue of a saucelabs timeout again...