diff --git a/tests/libcommuni/muc_join_leave.py b/tests/libcommuni/muc_join_leave.py
new file mode 100644
index 0000000000000000000000000000000000000000..1b7b0f719699787fe7c789a9e083ef7ec0a3f0de
--- /dev/null
+++ b/tests/libcommuni/muc_join_leave.py
@@ -0,0 +1,51 @@
+import optparse
+import sys
+import time
+import subprocess
+import os
+
+import sleekxmpp
+
+
+class Responder(sleekxmpp.ClientXMPP):
+	def __init__(self, jid, password, room, room_password, nick):
+		sleekxmpp.ClientXMPP.__init__(self, jid, password)
+		self.room = room
+		self.room_password = room_password
+		self.nick = nick
+		self.finished = False
+		self.add_event_handler("session_start", self.start)
+		self.add_event_handler("muc::" + room + "::got_online", self.muc_got_online)
+		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]
+
+	def muc_got_online(self, presence):
+		if presence['muc']['nick'] == "client":
+			self.tests["online_received"][1] = True
+
+	def muc_got_offline(self, presence):
+		if presence['muc']['nick'] == "client":
+			self.tests["offline_received"][1] = True
+			self.finished = True
+
+	def start(self, event):
+		self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=True)
+
+class Client(sleekxmpp.ClientXMPP):
+	def __init__(self, jid, password, room, nick):
+		sleekxmpp.ClientXMPP.__init__(self, jid, password)
+		self.room = room
+		self.nick = nick
+		self.add_event_handler("session_start", self.start)
+		self.finished = False
+
+		self.tests = {}
+
+	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)