diff --git a/rhodecode/tests/functional/test_admin_settings.py b/rhodecode/tests/functional/test_admin_settings.py
--- a/rhodecode/tests/functional/test_admin_settings.py
+++ b/rhodecode/tests/functional/test_admin_settings.py
@@ -61,8 +61,8 @@ class TestAdminSettingsController(TestCo
                                                  rhodecode_ga_code=new_ga_code
                                                  ))
 
-        self.assertTrue('Updated application settings' in
-                        response.session['flash'][0][1])
+        self.checkSessionFlash(response, 'Updated application settings')
+
         self.assertEqual(RhodeCodeSettings
                          .get_app_settings()['rhodecode_ga_code'], new_ga_code)
 
@@ -108,9 +108,7 @@ class TestAdminSettingsController(TestCo
                                                      rhodecode_ga_code=''
                                                      ))
 
-
-            self.assertTrue('Updated application settings' in
-                            response.session['flash'][0][1])
+            self.checkSessionFlash(response, 'Updated application settings')
             self.assertEqual(RhodeCodeSettings
                              .get_app_settings()['rhodecode_title'],
                              new_title.decode('utf-8'))
@@ -168,7 +166,9 @@ class TestAdminSettingsController(TestCo
                                                             email=old_email,))
 
         response.follow()
-        assert 'Your account was updated successfully' in response.session['flash'][0][1], 'no flash message about success of change'
+        self.checkSessionFlash(response,
+                               'Your account was updated successfully')
+
         user = self.sa.query(User).filter(User.username == 'test_admin').one()
         assert user.email == old_email , 'incorrect user email after update got %s vs %s' % (user.email, old_email)