diff --git a/rhodecode/tests/functional/test_login.py b/rhodecode/tests/functional/test_login.py
--- a/rhodecode/tests/functional/test_login.py
+++ b/rhodecode/tests/functional/test_login.py
@@ -5,15 +5,16 @@ from rhodecode.lib.utils2 import generat
 from rhodecode.lib.auth import check_password
 from rhodecode.lib import helpers as h
 from rhodecode.model import validators
+from rhodecode.model.meta import Session
 
 
 class TestLoginController(TestController):
 
     def tearDown(self):
         for n in Notification.query().all():
-            self.Session().delete(n)
+            Session().delete(n)
 
-        self.Session().commit()
+        Session().commit()
         self.assertEqual(Notification.query().all(), [])
 
     def test_index(self):
@@ -216,7 +217,7 @@ class TestLoginController(TestController
         self.assertEqual(response.status, '302 Found')
         self.checkSessionFlash(response, 'You have successfully registered into RhodeCode')
 
-        ret = self.Session().query(User).filter(User.username == 'test_regular4').one()
+        ret = Session().query(User).filter(User.username == 'test_regular4').one()
         self.assertEqual(ret.username, username)
         self.assertEqual(check_password(password, ret.password), True)
         self.assertEqual(ret.email, email)
@@ -254,8 +255,8 @@ class TestLoginController(TestController
         new.name = name
         new.lastname = lastname
         new.api_key = generate_api_key(username)
-        self.Session().add(new)
-        self.Session().commit()
+        Session().add(new)
+        Session().commit()
 
         response = self.app.post(url(controller='login',
                                      action='password_reset'),