diff --git a/modoboa/admin/tests/test_domain.py b/modoboa/admin/tests/test_domain.py
index d9a91d992..b910934cc 100644
--- a/modoboa/admin/tests/test_domain.py
+++ b/modoboa/admin/tests/test_domain.py
@@ -1,9 +1,9 @@
 # coding: utf-8
 
-from __future__ import unicode_literals
-
 """Domain related test cases."""
 
+from __future__ import unicode_literals
+
 from django.core.urlresolvers import reverse
 
 from modoboa.core.models import User
diff --git a/modoboa/limits/tests/test_user_limits.py b/modoboa/limits/tests/test_user_limits.py
index e57618755..004a0f585 100644
--- a/modoboa/limits/tests/test_user_limits.py
+++ b/modoboa/limits/tests/test_user_limits.py
@@ -81,7 +81,7 @@ class ResourceTestCase(lib_tests.ModoTestCase):
     def _create_domain(self, name, status=200, withtpl=False, **kwargs):
         values = {
             "name": name, "quota": 100, "default_mailbox_quota": 10,
-            "create_dom_admin": False,
+            "create_dom_admin": False, "with_mailbox": True,
             "create_aliases": False, "stepid": "step3", "type": "domain"
         }
         if withtpl: