diff --git a/src/node/ext/ldap/ugm/principals.rst b/docs/archive/ugm/principals.rst
similarity index 100%
rename from src/node/ext/ldap/ugm/principals.rst
rename to docs/archive/ugm/principals.rst
diff --git a/src/node/ext/ldap/ugm/sambaUsers.rst b/docs/archive/ugm/sambaUsers.rst
similarity index 100%
rename from src/node/ext/ldap/ugm/sambaUsers.rst
rename to docs/archive/ugm/sambaUsers.rst
diff --git a/src/node/ext/ldap/tests/__init__.py b/src/node/ext/ldap/tests/__init__.py
index fe265eb..f0bf26b 100644
--- a/src/node/ext/ldap/tests/__init__.py
+++ b/src/node/ext/ldap/tests/__init__.py
@@ -15,6 +15,7 @@ def test_suite():
     from node.ext.ldap.tests import test_ugm_group_of_names
     from node.ext.ldap.tests import test_ugm_posix_groups
     from node.ext.ldap.tests import test_ugm_principals
+    from node.ext.ldap.tests import test_ugm_samba_users
 
     suite = unittest.TestSuite()
 
@@ -30,6 +31,7 @@ def test_suite():
     suite.addTest(unittest.findTestCases(test_ugm_group_of_names))
     suite.addTest(unittest.findTestCases(test_ugm_posix_groups))
     suite.addTest(unittest.findTestCases(test_ugm_principals))
+    suite.addTest(unittest.findTestCases(test_ugm_samba_users))
 
     return suite
 
diff --git a/src/node/ext/ldap/tests/test_ugm_samba_users.py b/src/node/ext/ldap/tests/test_ugm_samba_users.py
new file mode 100644
index 0000000..670880c
--- /dev/null
+++ b/src/node/ext/ldap/tests/test_ugm_samba_users.py
@@ -0,0 +1,41 @@
+from node.tests import NodeTestCase
+from node.ext.ldap import testing
+from node.ext.ldap.ugm import Ugm
+
+
+class TestUGMSambaUsers(NodeTestCase):
+    layer = testing.LDIF_sambaUsers
+
+    def test_samba_users(self):
+        ucfg = self.layer['ucfg']
+        gcfg = self.layer['gcfg']
+        props = self.layer['props']
+
+        ugm = Ugm(props=props, ucfg=ucfg, gcfg=gcfg)
+        self.assertEqual(
+            ugm.users.search(),
+            [u'uid0', u'uid1', u'uid2']
+        )
+        self.assertEqual(
+            ugm.users['uid0'].context.attrs['userPassword'],
+            u'secret0'
+        )
+        self.assertEqual(
+            ugm.users['uid0'].context.attrs['sambaLMPassword'],
+            u'FF3750BCC2B22412AAD3B435B51404EE'
+        )
+        self.assertEqual(
+            ugm.users['uid0'].context.attrs['sambaNTPassword'],
+            u'62CF067F093CD75BBAA5D49E04689ED7'
+        )
+        ugm.users['uid0'].passwd('secret0', 'newsecret')
+        password = ugm.users['uid0'].context.attrs['userPassword']
+        self.assertTrue(password.startswith('{SSHA}'))
+        self.assertEqual(
+            ugm.users['uid0'].context.attrs['sambaLMPassword'],
+            u'DB6574A2642D294B9A0F5D12D8F612D0'
+        )
+        self.assertEqual(
+            ugm.users['uid0'].context.attrs['sambaNTPassword'],
+            u'58D9F1588236EE9D4ED739E89FFCA25B'
+        )