diff --git a/python/samba/tests/sddl.py b/python/samba/tests/sddl.py
index 2e945b8799e..ac719eb3212 100644
--- a/python/samba/tests/sddl.py
+++ b/python/samba/tests/sddl.py
@@ -616,6 +616,13 @@ class SddlNonCanonical(SddlDecodeEncodeBase):
           "(OU;CIIDSA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;"
           "bf967aa5-0de6-11d0-a285-00aa003049e2;WD)")),
 
+        (("O:LAG:BAD:P(A;OICI;0x1f01ff;;;BA)"),
+         ("O:LAG:BAD:P(A;OICI;FA;;;BA)")),
+
+        (("O:LAG:BAD:(A;;0x1ff;;;WD)",
+          ("O:LAG:BAD:(A;;CCDCLCSWRPWPDTLOCR;;;WD)"))),
+
+        ("D:(A;;FAGX;;;SY)", "D:(A;;0x201f01ff;;;SY)"),
     ]
 
 
@@ -649,7 +656,10 @@ class SddlCanonical(SddlDecodeEncodeBase):
         "O:S-1-2-512D:",
         "D:PARAI(A;;GA;;;SY)",
         "D:P(A;;GA;;;LG)(A;;GX;;;AA)",
-        "D:(A;;FA;;;WD)"
+        "D:(A;;FA;;;WD)",
+        "D:(A;;CCDCLCSWRPWPDTLOCR;;;WD)",
+        "D:(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)"
+
     ]
 
 
diff --git a/selftest/knownfail.d/sddl b/selftest/knownfail.d/sddl
index a6bcc5d27f7..1b4209843e4 100644
--- a/selftest/knownfail.d/sddl
+++ b/selftest/knownfail.d/sddl
@@ -1,3 +1,5 @@
 ^samba.tests.sddl.+.SddlCanonical.test_sddl_D:.A;;FA;;;WD..none
 ^samba.tests.sddl.+.SddlNonCanonical.test_sddl_D:.A;;0x001f01ff;;;WD..A;;0x001f01ff;;;S-1-5-21-11111111-22222222-33333333-1001..A;;0x001f01ff;;;S-1+11522-more-characters.none
+^samba.tests.sddl.+.SddlNonCanonical.test_sddl_D:.A;;FAGX;;;SY..none
+^samba.tests.sddl.+.SddlNonCanonical.test_sddl_O:LAG:BAD:P.A;OICI;0x1f01ff;;;BA..none
 ^samba.tests.sddl.+.SddlNonCanonical.test_sddl_O:S-1-5-21-2212615479-2695158682-2101375468-512G:S-1-5-21-2212615479-2695158682-2101375468-513D:P.A;+482-more-characters.none