diff --git a/src/test/test_plugin_xep_0085.py b/src/test/test_plugin_xep_0085.py
new file mode 100644
index 00000000..009916d5
--- /dev/null
+++ b/src/test/test_plugin_xep_0085.py
@@ -0,0 +1,73 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# SAT: a jabber client
+# Copyright (C) 2009, 2010, 2011, 2012, 2013  Jérôme Poisson (goffi@goffi.org)
+# Copyright (C) 2013  Adrien Cossa (souliane@mailoo.org)
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+""" Plugin chat states notification tests """
+
+from constants import Const
+from sat.test import helpers
+from sat.plugins import plugin_xep_0085 as plugin
+from sat.memory.memory import NO_SECURITY_LIMIT
+from copy import deepcopy
+from twisted.internet import defer
+from wokkel.generic import parseXml
+from twisted.words.protocols.jabber.jid import JID
+
+
+class XEP_0085Test(helpers.SatTestCase):
+
+    def setUp(self):
+        self.host = helpers.FakeSAT()
+        self.plugin = plugin.XEP_0085(self.host)
+
+    def test_messageReceived(self):
+        self.host.memory.init()
+        self.host.memory.setParam(plugin.PARAM_NAME, True, plugin.PARAM_KEY, NO_SECURITY_LIMIT, Const.TEST_PROFILE)
+        for state in plugin.CHAT_STATES:
+            xml = """
+            <message type="chat" from="sender@example.net/house" to="sender@example.net/house" id="test_1">
+            %s
+            <%s xmlns='http://jabber.org/protocol/chatstates'/>
+            </message>
+            """ % ("<body>test</body>" if state == "active" else "", state)
+            stanza = parseXml(xml)
+            self.host.bridge.expectCall("chatStateReceived", u"sender@example.net/house", state, Const.TEST_PROFILE)
+            self.plugin.messageReceivedTrigger(stanza, defer.Deferred(), Const.TEST_PROFILE)
+
+    def test_sendMessageTrigger(self):
+        self.host.memory.init()
+        self.host.memory.setParam(plugin.PARAM_NAME, True, plugin.PARAM_KEY, NO_SECURITY_LIMIT, Const.TEST_PROFILE)
+        for state in plugin.CHAT_STATES:
+            mess_data = {"to": "test@example.org/SàT",
+                         "type": "chat",
+                         "message": "content",
+                         "extra": {} if state == "active" else {"chat_state": state}}
+            mess_data['xml'] = parseXml("""
+            <message type="chat" from="sender@example.net/house" to="test@example.org/SàT" id="test_1">
+            %s
+            </message>
+            """ % (("<body>%s</body>" % mess_data['message']) if state == "active" else "",))
+            expected = deepcopy(mess_data['xml'])
+            expected.addElement(state, plugin.NS_CHAT_STATES)
+            treatments = defer.Deferred()
+            self.plugin.sendMessageTrigger(mess_data, treatments, Const.TEST_PROFILE)
+            xml = treatments.callbacks[0][0][0](mess_data)
+            # cancel the timer to not block the process
+            self.plugin.map[Const.TEST_PROFILE][Const.TEST_JID.userhostJID()].timer.cancel()
+            self.assertEqualXML(xml['xml'].toXml().encode("utf-8"), expected.toXml().encode("utf-8"))