diff --git a/kallithea/tests/conftest.py b/kallithea/tests/conftest.py
--- a/kallithea/tests/conftest.py
+++ b/kallithea/tests/conftest.py
@@ -10,7 +10,7 @@ import pytest
 from kallithea.model.user import UserModel
 from kallithea.model.meta import Session
 from kallithea.model.db import Setting, User, UserIpMap
-from kallithea.tests import invalidate_all_caches
+from kallithea.tests import invalidate_all_caches, TEST_USER_REGULAR_LOGIN
 
 
 def pytest_configure():
@@ -94,10 +94,14 @@ def auto_clear_ip_permissions():
     yield
     # cleanup
     user_model = UserModel()
-    default_user_id = User.get_default_user().user_id
-    for ip in UserIpMap.query().filter(UserIpMap.user_id ==
-                                       default_user_id):
-        user_model.delete_extra_ip(default_user_id, ip.ip_id)
+
+    user_ids = []
+    user_ids.append(User.get_default_user().user_id)
+    user_ids.append(User.get_by_username(TEST_USER_REGULAR_LOGIN).user_id)
+
+    for user_id in user_ids:
+        for ip in UserIpMap.query().filter(UserIpMap.user_id == user_id):
+            user_model.delete_extra_ip(user_id, ip.ip_id)
 
     # IP permissions are cached, need to invalidate this cache explicitly
     invalidate_all_caches()
diff --git a/kallithea/tests/functional/test_admin_users.py b/kallithea/tests/functional/test_admin_users.py
--- a/kallithea/tests/functional/test_admin_users.py
+++ b/kallithea/tests/functional/test_admin_users.py
@@ -394,7 +394,7 @@ class TestAdminUsersController(TestContr
         ('127_bad_mask', '127.0.0.1/99', '127.0.0.1 - 127.0.0.1', True),
         ('127_bad_ip', 'foobar', 'foobar', True),
     ])
-    def test_add_ip(self, test_name, ip, ip_range, failure):
+    def test_add_ip(self, test_name, ip, ip_range, failure, auto_clear_ip_permissions):
         self.log_user()
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
         user_id = user.user_id
@@ -413,12 +413,7 @@ class TestAdminUsersController(TestContr
             response.mustcontain(ip)
             response.mustcontain(ip_range)
 
-        ## cleanup
-        for del_ip in UserIpMap.query().filter(UserIpMap.user_id == user_id).all():
-            Session().delete(del_ip)
-            Session().commit()
-
-    def test_delete_ip(self):
+    def test_delete_ip(self, auto_clear_ip_permissions):
         self.log_user()
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
         user_id = user.user_id