diff --git a/gnuviechadmin/managemails/tests/test_admin.py b/gnuviechadmin/managemails/tests/test_admin.py
index 58e99b7..6dd7169 100644
--- a/gnuviechadmin/managemails/tests/test_admin.py
+++ b/gnuviechadmin/managemails/tests/test_admin.py
@@ -160,7 +160,7 @@ class MailBoxAdminTest(TestCase):
         form = self.mbadmin.get_form(Mock)
         self.assertEqual(
             form.Meta.fields,
-            ['username', 'password1', 'password2']
+            ['osuser', 'password1', 'password2']
         )
 
     @override_settings(
diff --git a/gnuviechadmin/osusers/tests/test_admin.py b/gnuviechadmin/osusers/tests/test_admin.py
index cf75a5a..8e49ccb 100644
--- a/gnuviechadmin/osusers/tests/test_admin.py
+++ b/gnuviechadmin/osusers/tests/test_admin.py
@@ -6,17 +6,14 @@ from django.test.utils import override_settings
 from mock import patch, Mock
 
 from osusers.models import (
-    DeleteTaskResult,
     Group,
     User,
 )
 from osusers.admin import (
-    DeleteTaskResultAdmin,
     GroupAdmin,
     PASSWORD_MISMATCH_ERROR,
     UserAdmin,
     UserCreationForm,
-    UserTaskResultInline,
 )
 
 
@@ -85,7 +82,7 @@ class UserAdminTest(TestCase):
         form = self.uadmin.get_form(Mock(name='request'))
         self.assertEqual(
             form.Meta.fields,
-            ['password1', 'password2']
+            ['customer', 'password1', 'password2']
         )
 
     @override_settings(
@@ -103,7 +100,7 @@ class UserAdminTest(TestCase):
 
     def test_get_inline_instances_without_object(self):
         inlines = self.uadmin.get_inline_instances(Mock(name='request'))
-        self.assertEqual(inlines, [])
+        self.assertEqual(len(inlines), 2)
 
     @override_settings(
         CELERY_ALWAYS_EAGER=True,
diff --git a/gnuviechadmin/osusers/tests/test_models.py b/gnuviechadmin/osusers/tests/test_models.py
index 7fe2736..f1a2c11 100644
--- a/gnuviechadmin/osusers/tests/test_models.py
+++ b/gnuviechadmin/osusers/tests/test_models.py
@@ -12,12 +12,9 @@ from passlib.hash import sha512_crypt
 from osusers.models import (
     CANNOT_USE_PRIMARY_GROUP_AS_ADDITIONAL,
     AdditionalGroup,
-    DeleteTaskResult,
     Group,
-    GroupTaskResult,
     Shadow,
     User,
-    UserTaskResult,
 )
 
 
@@ -62,13 +59,7 @@ class AdditionalGroupTest(TestCaseWithCeleryTasks):
     def test_delete(self):
         group2 = Group.objects.create(groupname='test2', gid=1001)
         addgroup = AdditionalGroup.objects.create(user=self.user, group=group2)
-        DeleteTaskResult.objects.all().delete()
         addgroup.delete()
-        taskres = DeleteTaskResult.objects.all()
-        self.assertTrue(len(taskres), 1)
-        self.assertEqual(taskres[0].task_name, 'remove_ldap_user_from_group')
-        self.assertEqual(taskres[0].modeltype, 'usergroup')
-        self.assertEqual(taskres[0].modelname, 'test (1000) in test2 (1001)')
         self.assertEqual(len(AdditionalGroup.objects.all()), 0)
 
     def test___str__(self):
@@ -107,12 +98,6 @@ class GroupTest(TestCaseWithCeleryTasks):
         group.delete()
         self.assertEqual(len(Group.objects.all()), 0)
         self.assertEqual(len(GroupTaskResult.objects.all()), 0)
-        taskres = DeleteTaskResult.objects.all()
-        self.assertEqual(len(taskres), 1)
-        self.assertEqual(taskres[0].task_name,
-                         'delete_ldap_group_if_empty')
-        self.assertEqual(taskres[0].modeltype, 'group')
-        self.assertEqual(taskres[0].modelname, 'test')
 
 
 class ShadowManagerTest(TestCaseWithCeleryTasks):
diff --git a/gnuviechadmin/osusers/tests/test_tasks.py b/gnuviechadmin/osusers/tests/test_tasks.py
deleted file mode 100644
index e3b409f..0000000
--- a/gnuviechadmin/osusers/tests/test_tasks.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from django.test import TestCase
-
-from osusers.tasks import LdapRouter
-
-
-class LdapRouterTest(TestCase):
-    def setUp(self):
-        self.router = LdapRouter()
-        super(LdapRouterTest, self).setUp()
-
-    def test_ldap_tasks_are_routed_to_ldap_queue(self):
-        route = self.router.route_for_task(
-            'some_ldap_task')
-        self.assertEqual(
-            route,
-            {'exchange': 'ldap',
-             'exchange_type': 'direct',
-             'queue': 'ldap'})
-
-    def test_non_ldap_tasks_are_routed_to_default(self):
-        self.assertIsNone(
-            self.router.route_for_task('other'))