Travis test run robustness

Hopefully this should fix the intermittent travis failure. I'll keep an eye on things and revisit if it doesn't.