diff --git a/modoboa/core/api/v2/tests.py b/modoboa/core/api/v2/tests.py
index df2a9ac0b..ecc051fd4 100644
--- a/modoboa/core/api/v2/tests.py
+++ b/modoboa/core/api/v2/tests.py
@@ -1,7 +1,6 @@
 """Core API related tests."""
 
 import copy
-import datetime
 import getpass
 import oath
 from unittest import mock
@@ -14,7 +13,7 @@ from django.utils.http import urlsafe_base64_encode
 from django_rq import get_worker, get_queue
 
 from modoboa.admin import factories
-from modoboa.core import models, jobs
+from modoboa.core import models
 from modoboa.core.tests import utils
 from modoboa.lib.tests import ModoAPITestCase
 from rest_framework.authtoken.models import Token
diff --git a/modoboa/core/tests/test_views.py b/modoboa/core/tests/test_views.py
index da9d7199a..10643e2a8 100644
--- a/modoboa/core/tests/test_views.py
+++ b/modoboa/core/tests/test_views.py
@@ -232,12 +232,12 @@ class SettingsTestCase(ModoTestCase):
         settings = SETTINGS_SAMPLE.copy()
         response = self.client.post(url, settings, format="json")
         self.assertEqual(response.status_code, 200)
-        settings["core-password_scheme"] = "sha512crypt"
+        settings["core-password_scheme"] = "magic_password_scheme"
         response = self.client.post(url, settings, format="json")
         self.assertEqual(response.status_code, 400)
         compare(response.json(), {
             "form_errors": {"password_scheme": ["Select a valid choice. \
-sha512crypt is not one of the available choices."]},
+magic_password_scheme is not one of the available choices."]},
             "prefix": "core"
         })
         settings["core-password_scheme"] = "plain"