diff --git a/gnuviechadmin/osusers/admin.py b/gnuviechadmin/osusers/admin.py
index 3a23b82..fb21576 100644
--- a/gnuviechadmin/osusers/admin.py
+++ b/gnuviechadmin/osusers/admin.py
@@ -84,7 +84,10 @@ class UserCreationForm(forms.ModelForm):
         return user
 
     def save_m2m(self):
-        pass
+        """
+        No additional groups are created when this form is saved, so this
+        method just does nothing.
+        """
 
 
 class UserAdmin(admin.ModelAdmin):
diff --git a/gnuviechadmin/osusers/tests/test_admin.py b/gnuviechadmin/osusers/tests/test_admin.py
index fa1a524..cf75a5a 100644
--- a/gnuviechadmin/osusers/tests/test_admin.py
+++ b/gnuviechadmin/osusers/tests/test_admin.py
@@ -1,12 +1,21 @@
-from django.test import TestCase
+from django import forms
 from django.contrib.admin import AdminSite
+from django.test import TestCase
+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,
 )
 
@@ -22,10 +31,137 @@ class TaskResultInlineTest(TestCase):
             mock.return_value = [entrymock]
             requestmock = Mock(name='request')
             UserTaskResultInline(User, self.site).get_queryset(requestmock)
-            entrymock.assert_calledwith()
+            entrymock.update_taskstatus.assert_calledwith()
 
     def test_has_add_permissions_returns_false(self):
         self.assertFalse(
             UserTaskResultInline(User, self.site).has_add_permission(
                 self, Mock(name='request'))
         )
+
+
+class UserCreationFormTest(TestCase):
+    def test_clean_password2_same(self):
+        form = UserCreationForm()
+        form.cleaned_data = {'password1': 'secret', 'password2': 'secret'}
+        self.assertEqual(form.clean_password2(), 'secret')
+
+    def test_clean_password2_empty(self):
+        form = UserCreationForm()
+        form.cleaned_data = {}
+        self.assertIsNone(form.clean_password2())
+
+    def test_clean_password2_mismatch(self):
+        form = UserCreationForm()
+        form.cleaned_data = {'password1': 'secretx', 'password2': 'secrety'}
+        with self.assertRaises(forms.ValidationError) as cm:
+            form.clean_password2()
+        self.assertEqual(cm.exception.message, PASSWORD_MISMATCH_ERROR)
+
+    @override_settings(
+        CELERY_ALWAYS_EAGER=True,
+        CELERY_CACHE_BACKEND='memory',
+        BROKER_BACKEND='memory'
+    )
+    def test_save_commit(self):
+        form = UserCreationForm()
+        form.cleaned_data = {'password1': 'secret', 'password2': 'secret'}
+        user = form.save()
+        self.assertIsNotNone(user)
+        self.assertEqual(User.objects.get(pk=user.uid), user)
+
+    def test_save_m2m_returns_none(self):
+        form = UserCreationForm()
+        self.assertIsNone(form.save_m2m())
+
+
+class UserAdminTest(TestCase):
+    def setUp(self):
+        site = AdminSite()
+        self.uadmin = UserAdmin(User, site)
+        super(UserAdminTest, self).setUp()
+
+    def test_get_form_without_object(self):
+        form = self.uadmin.get_form(Mock(name='request'))
+        self.assertEqual(
+            form.Meta.fields,
+            ['password1', 'password2']
+        )
+
+    @override_settings(
+        CELERY_ALWAYS_EAGER=True,
+        CELERY_CACHE_BACKEND='memory',
+        BROKER_BACKEND='memory'
+    )
+    def test_get_form_with_object(self):
+        user = User.objects.create_user()
+        form = self.uadmin.get_form(Mock(name='request'), user)
+        self.assertEqual(
+            form.Meta.fields,
+            ['username', 'group', 'gecos', 'homedir', 'shell', 'uid']
+        )
+
+    def test_get_inline_instances_without_object(self):
+        inlines = self.uadmin.get_inline_instances(Mock(name='request'))
+        self.assertEqual(inlines, [])
+
+    @override_settings(
+        CELERY_ALWAYS_EAGER=True,
+        CELERY_CACHE_BACKEND='memory',
+        BROKER_BACKEND='memory'
+    )
+    def test_get_inline_instances_with_object(self):
+        user = User.objects.create_user()
+        inlines = self.uadmin.get_inline_instances(
+            Mock(name='request'), user)
+        self.assertEqual(len(inlines), len(UserAdmin.inlines))
+        for index in range(len(inlines)):
+            self.assertIsInstance(inlines[index], UserAdmin.inlines[index])
+
+
+class GroupAdminTest(TestCase):
+    def setUp(self):
+        site = AdminSite()
+        self.gadmin = GroupAdmin(Group, site)
+        super(GroupAdminTest, self).setUp()
+
+    def test_get_inline_instances_without_object(self):
+        inlines = self.gadmin.get_inline_instances(Mock(name='request'))
+        self.assertEqual(inlines, [])
+
+    @override_settings(
+        CELERY_ALWAYS_EAGER=True,
+        CELERY_CACHE_BACKEND='memory',
+        BROKER_BACKEND='memory'
+    )
+    def test_get_inline_instances_with_object(self):
+        group = Group.objects.create(gid=1000, groupname='test')
+        inlines = self.gadmin.get_inline_instances(
+            Mock(name='request'), group)
+        self.assertEqual(len(inlines), len(GroupAdmin.inlines))
+        for index in range(len(inlines)):
+            self.assertIsInstance(inlines[index], GroupAdmin.inlines[index])
+
+
+class DeleteTaskResultAdminTest(TestCase):
+    def setUp(self):
+        site = AdminSite()
+        self.dtradmin = DeleteTaskResultAdmin(DeleteTaskResult, site)
+        super(DeleteTaskResultAdminTest, self).setUp()
+
+    def test_has_add_permission_returns_false_without_object(self):
+        self.assertFalse(
+            self.dtradmin.has_add_permission(Mock(name='request')))
+
+    def test_has_add_permission_returns_false_with_object(self):
+        self.assertFalse(
+            self.dtradmin.has_add_permission(Mock(name='request'),
+                                             Mock(name='test')))
+
+    def test_get_queryset_calls_update_taskstatus(self):
+        with patch('osusers.admin.admin.ModelAdmin.get_queryset') as mock:
+            entrymock = Mock(name='entry')
+            mock.return_value = [entrymock]
+            requestmock = Mock(name='request')
+            self.dtradmin.get_queryset(requestmock)
+            entrymock.update_taskstatus.assert_calledwith()