diff --git a/LCS/Messaging/python/messaging/test/t_messagebus.py b/LCS/Messaging/python/messaging/test/t_messagebus.py
index 1e861c17b3e531d76458c0f750fa24f518d1df63..5c86702dba1bdeeb13a8725ee6fba686578dd666 100644
--- a/LCS/Messaging/python/messaging/test/t_messagebus.py
+++ b/LCS/Messaging/python/messaging/test/t_messagebus.py
@@ -35,6 +35,9 @@ from lofar.messaging.exceptions import MessageBusError, InvalidMessage
 
 TIMEOUT = 1.0
 
+# Disable auto reconnect to test behaviour w.r.t. invalid addresses
+DEFAULT_BROKER_OPTIONS['reconnect'] = False
+
 
 # ========  FromBus unit tests  ======== #
 
@@ -171,18 +174,11 @@ class ToBusInitFailed(unittest.TestCase):
         """
         Connecting to broker on wrong port must raise MessageBusError
         """
-        # Cache and disable auto reconnect
-        old_reconnect = DEFAULT_BROKER_OPTIONS.get('reconnect', False)
-        DEFAULT_BROKER_OPTIONS['reconnect'] = False
-
         regexp = re.escape(self.error) + '.*' + 'Connection refused'
         with self.assertRaisesRegexp(MessageBusError, regexp):
             with ToBus(QUEUE, broker="localhost:4"):
                 pass
 
-        # Restore auto reconnect
-        DEFAULT_BROKER_OPTIONS['reconnect'] = old_reconnect
-
 
 class ToBusSendMessage(unittest.TestCase):
     """