am 40122b34: Fix failing connection tests.

* commit '40122b34be21ad22816427c807d88a2d8fcd8b22':
  Fix failing connection tests.