diff --git a/modoboa/admin/tests/test_account.py b/modoboa/admin/tests/test_account.py
index 6a7a2e1ba..522899025 100644
--- a/modoboa/admin/tests/test_account.py
+++ b/modoboa/admin/tests/test_account.py
@@ -158,12 +158,12 @@ class PermissionsTestCase(ModoTestCase):
     def setUpTestData(cls):
         """Create test data."""
         from modoboa.lib import parameters
-        from modoboa.limits.models import LimitTemplates
+        from modoboa.limits import utils as limits_utils
 
         super(PermissionsTestCase, cls).setUpTestData()
-        for tpl in LimitTemplates().templates:
+        for name, tpl in limits_utils.get_limit_templates():
             parameters.save_admin(
-                "DEFLT_{0}".format(tpl[0].upper()), 2,
+                "DEFLT_{0}_LIMIT".format(name.upper()), 2,
                 app="limits"
             )
         factories.populate_database()
diff --git a/modoboa/relaydomains/tests.py b/modoboa/relaydomains/tests.py
index 13a2139fa..70e840666 100644
--- a/modoboa/relaydomains/tests.py
+++ b/modoboa/relaydomains/tests.py
@@ -9,7 +9,7 @@ from modoboa.core.factories import UserFactory
 from modoboa.lib import parameters
 from modoboa.lib.tests import ModoTestCase
 from modoboa.lib.test_utils import MapFilesTestCaseMixin
-from modoboa.limits.models import LimitTemplates
+from modoboa.limits import utils as limits_utils
 
 from .factories import RelayDomainFactory
 from .models import RelayDomain, Service
@@ -233,9 +233,9 @@ class LimitsTestCase(ModoTestCase, Operations):
         """Create test data."""
         super(LimitsTestCase, cls).setUpTestData()
 
-        for tpl in LimitTemplates().templates:
+        for name, tpl in limits_utils.get_limit_templates():
             parameters.save_admin(
-                "DEFLT_{0}".format(tpl[0].upper()), 2, app="limits"
+                "DEFLT_{0}_LIMIT".format(name.upper()), 2, app="limits"
             )
         cls.user = UserFactory.create(
             username='reseller', groups=('Resellers',)