diff --git a/LCS/Messaging/python/messaging/test/t_messagebus.py b/LCS/Messaging/python/messaging/test/t_messagebus.py
index 596e885adbd26b0a332f4774d3cc963ed1164995..10e0a72f19c01fc48b5acb2c022e5996b83c3d75 100644
--- a/LCS/Messaging/python/messaging/test/t_messagebus.py
+++ b/LCS/Messaging/python/messaging/test/t_messagebus.py
@@ -35,7 +35,7 @@ from lofar.messaging.messagebus import *
 from lofar.messaging.exceptions import MessageBusError, InvalidMessage
 
 TIMEOUT = 1.0
-
+QUEUE = sys.argv[-1] if len(sys.argv) > 1 and "t_messagebus.py" not in sys.argv[-1] else "t_messagebus.queue"
 logger = logging.getLogger(__name__)
 
 
@@ -78,12 +78,11 @@ class FromBusNotInContext(unittest.TestCase):
         self.frombus = FromBus(QUEUE)
         self.error = re.escape("[FromBus] No active receiver") + '.*'
 
-    @unittest.skip("Why is this important? It's a private function anyway...")
     def test_add_queue_raises(self):
         """
         Adding a queue when outside context must raise MessageBusError
         """
-        with self.assertRaisesRegex(MessageBusError, self.error):
+        with self.assertRaises(MessageBusError):
             self.frombus._add_queue("fooqueue")
 
     def test_receive_raises(self):
@@ -296,7 +295,12 @@ class SendReceiveMessage(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    logging.basicConfig(level=logging.INFO)
-    QUEUE = sys.argv[1] if len(sys.argv) > 1 else "testqueue"
-    del sys.argv[1:]
+    logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', level=logging.DEBUG)
+
+    # delete last cmdlime argument if it holds the test-queue-name,
+    # so it is not passed on to the unittest framework.
+    # see also t_messagebus.run
+    if len(sys.argv) > 1 and sys.argv[-1].strip() != "t_messagebus.py":
+        del sys.argv[-1]
+
     unittest.main()