diff --git a/tests/test_selfservice.py b/tests/test_selfservice.py
index 220950fd0d6f926790f8c6afe18052d165b88a5f..916443d29d408debd12d6ec82971c44602257c3f 100644
--- a/tests/test_selfservice.py
+++ b/tests/test_selfservice.py
@@ -3,13 +3,13 @@ import unittest
 
 from flask import url_for
 
-from uffd.ldap import ldap
-from uffd import user
+# These imports are required, because otherwise we get circular imports?!
+from uffd import ldap, user
 
 from uffd.session.views import get_current_user
 from uffd.selfservice.models import MailToken, PasswordToken
 from uffd.user.models import User
-from uffd import create_app, db, ldap
+from uffd import create_app, db
 
 from utils import dump, UffdTestCase
 
diff --git a/tests/test_user.py b/tests/test_user.py
index 0120d6943bdf72778708e05f8bf6edfd32ab1688..41e26e0495ed7a76498017cc8024b34386ec5973 100644
--- a/tests/test_user.py
+++ b/tests/test_user.py
@@ -1,5 +1,4 @@
 import datetime
-import time
 import unittest
 
 from flask import url_for, session
@@ -7,14 +6,14 @@ from flask import url_for, session
 # These imports are required, because otherwise we get circular imports?!
 from uffd import ldap, user
 
+from uffd.session.views import get_current_user
 from uffd.user.models import User
 from uffd.role.models import Role
-from uffd.session.views import get_current_user, is_valid_session
-from uffd.mfa.models import MFAMethod, MFAType, RecoveryCodeMethod, TOTPMethod, WebauthnMethod, _hotp
 from uffd import create_app, db
 
 from utils import dump, UffdTestCase
 
+
 def get_user():
 	return User.query.get('uid=testuser,ou=users,dc=example,dc=com')