diff --git a/src/test/test_memory_memory.py b/src/test/test_memory.py
similarity index 100%
rename from src/test/test_memory_memory.py
rename to src/test/test_memory.py
diff --git a/src/test/test_plugin_xep_0033.py b/src/test/test_plugin_xep_0033.py
index dd019335..995d3f27 100644
--- a/src/test/test_plugin_xep_0033.py
+++ b/src/test/test_plugin_xep_0033.py
@@ -23,7 +23,6 @@
 from constants import Const
 from sat.test import helpers
 from sat.plugins import plugin_xep_0033 as plugin
-from sat.memory.memory import NO_SECURITY_LIMIT
 from sat.core.sat_main import AbortSendMessage, MessageSentAndStored
 from copy import deepcopy
 from twisted.internet import defer
diff --git a/src/test/test_plugin_xep_0085.py b/src/test/test_plugin_xep_0085.py
index e278153b..429fa1be 100644
--- a/src/test/test_plugin_xep_0085.py
+++ b/src/test/test_plugin_xep_0085.py
@@ -22,8 +22,8 @@
 
 from constants import Const
 from sat.test import helpers
+from sat.core.constants import Const as C
 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
@@ -38,7 +38,7 @@ class XEP_0085Test(helpers.SatTestCase):
 
     def test_messageReceived(self):
         self.host.memory.init()
-        self.host.memory.setParam(plugin.PARAM_NAME, True, plugin.PARAM_KEY, NO_SECURITY_LIMIT, Const.PROFILE[0])
+        self.host.memory.setParam(plugin.PARAM_NAME, True, plugin.PARAM_KEY, C.NO_SECURITY_LIMIT, Const.PROFILE[0])
         for state in plugin.CHAT_STATES:
             xml = u"""
             <message type="chat" from="%s" to="%s" id="test_1">
@@ -55,7 +55,7 @@ class XEP_0085Test(helpers.SatTestCase):
 
     def test_sendMessageTrigger(self):
         self.host.memory.init()
-        self.host.memory.setParam(plugin.PARAM_NAME, True, plugin.PARAM_KEY, NO_SECURITY_LIMIT, Const.PROFILE[0])
+        self.host.memory.setParam(plugin.PARAM_NAME, True, plugin.PARAM_KEY, C.NO_SECURITY_LIMIT, Const.PROFILE[0])
         for state in plugin.CHAT_STATES:
             mess_data = {"to": Const.JID[0],
                          "type": "chat",