diff --git a/gnuviechadmin/osusers/tests/test_models.py b/gnuviechadmin/osusers/tests/test_models.py
index cf452ee..9f78198 100644
--- a/gnuviechadmin/osusers/tests/test_models.py
+++ b/gnuviechadmin/osusers/tests/test_models.py
@@ -1,6 +1,9 @@
+from datetime import date
+
 from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.utils import timezone
 
 from mock import patch, MagicMock
 
@@ -86,6 +89,24 @@ class GroupTest(TestCaseWithCeleryTasks):
         self.assertEqual(taskres[0].modelname, 'test')
 
 
+class ShadowManagerTest(TestCaseWithCeleryTasks):
+    def test_create_shadow(self):
+        user = User(
+            username='test', uid=1000,
+            group=Group(gid=1000, groupname='test'),
+            homedir='/home/test', shell='/bin/fooshell')
+        shadow = Shadow.objects.create_shadow(user, 'test')
+        self.assertTrue(sha512_crypt.verify('test', shadow.passwd))
+        self.assertEqual(shadow.changedays,
+                         (timezone.now().date() - date(1970, 1, 1)).days)
+        self.assertEqual(shadow.user, user)
+        self.assertEqual(shadow.minage, 0)
+        self.assertIsNone(shadow.maxage)
+        self.assertEqual(shadow.gracedays, 7)
+        self.assertEqual(shadow.inactdays, 30)
+        self.assertIsNone(shadow.expiredays)
+
+
 class ShadowTest(TestCaseWithCeleryTasks):
     def test___str__(self):
         group = Group.objects.create(