Fix tests expecting normally fast servers (e.g. fix test on travis)
Merge pull request #620 from bjori/travis-is-getting-slower

Fix tests expecting normally fast servers (e.g. fix test on travis)

* bjori/travis-is-getting-slower:
  Fix tests expecting normally fast servers (e.g. fix test on travis)