diff --git a/tests/libcommuni/muc_join_leave.py b/tests/libcommuni/muc_join_leave.py
index 1b7b0f719699787fe7c789a9e083ef7ec0a3f0de..6bbf73f71ac13ea7351787576544146956c748fd 100644
--- a/tests/libcommuni/muc_join_leave.py
+++ b/tests/libcommuni/muc_join_leave.py
@@ -19,8 +19,8 @@ class Responder(sleekxmpp.ClientXMPP):
 		self.add_event_handler("muc::" + room + "::got_offline", self.muc_got_offline)
 
 		self.tests = {}
-		self.tests["online_received"] = ["libcommuni: Received available presence", False]
-		self.tests["offline_received"] = ["libcommuni: Received unavailable presence", False]
+		self.tests["online_received"] = ["libcommuni: Received available presence from 'client'", False]
+		self.tests["offline_received"] = ["libcommuni: Received unavailable presence frin 'client'", False]
 
 	def muc_got_online(self, presence):
 		if presence['muc']['nick'] == "client":
@@ -40,12 +40,18 @@ class Client(sleekxmpp.ClientXMPP):
 		self.room = room
 		self.nick = nick
 		self.add_event_handler("session_start", self.start)
+		self.add_event_handler("muc::" + room + "::got_online", self.muc_got_online)
 		self.finished = False
 
 		self.tests = {}
+		self.tests["online_received"] = ["libcommuni: Received available presence from 'responder'", False]
+
+	def muc_got_online(self, presence):
+		if presence['muc']['nick'] == "responder":
+			self.tests["online_received"][1] = True
+			self.plugin['xep_0045'].leaveMUC(self.room, self.nick)
 
 	def start(self, event):
 		self.getRoster()
 		self.sendPresence()
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
-		self.plugin['xep_0045'].leaveMUC(self.room, self.nick)