improve test flakiness on travis/jenkins