diff --git a/tests/libcommuni/muc_echo.py b/tests/libcommuni/muc_echo.py
new file mode 100644
index 0000000000000000000000000000000000000000..80516d25e6dc5fa73bc9144856b25a0b423720d3
--- /dev/null
+++ b/tests/libcommuni/muc_echo.py
@@ -0,0 +1,53 @@
+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.nick = nick
+		self.room_password = room_password
+		self.finished = False
+		self.add_event_handler("session_start", self.start)
+		self.add_event_handler("groupchat_message", self.muc_message)
+
+		self.tests = {}
+
+	def muc_message(self, msg):
+		if msg['mucnick'] != self.nick:
+			self.send_message(mto=msg['from'].bare,
+							mbody="echo %s" % msg['body'],
+							mtype='groupchat')
+
+	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.add_event_handler("groupchat_message", self.muc_message)
+		self.finished = False
+
+		self.tests = {}
+		self.tests["echo_received"] = ["libcommuni: Send and receive messages", False]
+
+	def muc_message(self, msg):
+		if msg['mucnick'] != self.nick:
+			if msg['body'] == "echo abc" or msg['body'] == "<owner> echo abc":
+				self.tests["echo_received"][1] = True
+				self.finished = True
+
+	def start(self, event):
+		self.getRoster()
+		self.sendPresence()
+		self.plugin['xep_0045'].joinMUC(self.room, self.nick, wait=True)
+		self.send_message(mto=self.room, mbody="abc", mtype='groupchat')