diff --git a/ChangeLog.txt b/ChangeLog.txt
index 152e634f..741b53e8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -6,6 +6,7 @@ Broker:
 - Fix use_identity_as_username not working on websockets clients.
 - Don't crash if an auth plugin returns MOSQ_ERR_AUTH for a username check on
   a websockets client. Closes #490.
+- Fix 08-ssl-bridge.py test when using async dns lookups. Closes #507.
 
 Client library:
 - Fix incorrect PSK key being used if it had leading zeroes.
diff --git a/test/broker/08-ssl-bridge.conf b/test/broker/08-ssl-bridge.conf
index fc2c17b5..ec057b66 100644
--- a/test/broker/08-ssl-bridge.conf
+++ b/test/broker/08-ssl-bridge.conf
@@ -4,6 +4,7 @@ connection bridge_test
 address localhost:1888
 topic bridge/# both 0
 notifications false
+restart_timeout 2
 
 #bridge_cafile ../ssl/test-root-ca.crt
 bridge_cafile ../ssl/all-ca.crt