--- a/kallithea/tests/conftest.py	Sun Jun 12 21:32:15 2016 +0200
+++ b/kallithea/tests/conftest.py	Wed Jun 15 23:36:29 2016 +0200
@@ -9,7 +9,7 @@
 import pytest
 from kallithea.model.user import UserModel
 from kallithea.model.meta import Session
-from kallithea.model.db import Setting
+from kallithea.model.db import Setting, User
 
 
 def pytest_configure():
@@ -41,14 +41,14 @@
 @pytest.yield_fixture
 def create_test_user():
     """Provide users that automatically disappear after test is over."""
-    test_users = []
+    test_user_ids = []
     def _create_test_user(user_form):
         user = UserModel().create(user_form)
-        test_users.append(user)
+        test_user_ids.append(user.user_id)
         return user
     yield _create_test_user
-    for user in test_users:
-        UserModel().delete(user)
+    for user_id in test_user_ids:
+        UserModel().delete(user_id)
     Session().commit()