diff --git a/kallithea/tests/__init__.py b/kallithea/tests/__init__.py
--- a/kallithea/tests/__init__.py
+++ b/kallithea/tests/__init__.py
@@ -208,7 +208,9 @@ class TestController(BaseTestCase):
     def checkSessionFlash(self, response, msg):
         self.assertTrue('flash' in response.session,
                         msg='Response session have no flash key' % response.session)
-        if not msg in response.session['flash'][0][1]:
-            msg = u'msg `%s` not found in session flash: got `%s` instead' % (
-                      msg, response.session['flash'][0][1])
+        if not any(msg in m for level, m in response.session['flash']):
+            for level, m in response.session['flash']:
+                msg = u'msg `%s` not found in session flash: got `%s` instead' % (msg, m)
+                self.fail(safe_str(msg))
+            msg = u'msg `%s` not found in empty session flash' % (msg)
             self.fail(safe_str(msg))