Skip the test if we can't get connection fast enough for the test
Merge pull request #678 from bjori/testfix

Skip the test if we can't get connection fast enough for the test

* bjori/testfix:
  Skip the test if we can't get connection fast enough for the test
Merge remote-tracking branch 'upstream/v1.5'

* upstream/v1.5:
  Skip the test if we can't get connection fast enough for the test