diff --git a/python/samba/tests/sid_strings.py b/python/samba/tests/sid_strings.py
index ece35c12bfc..71b7756d235 100644
--- a/python/samba/tests/sid_strings.py
+++ b/python/samba/tests/sid_strings.py
@@ -88,11 +88,17 @@ class SidStringTests(TestCase):
 
         class_dn = f'CN={class_name},{self.schema_dn}'
 
+        governs_id = f'1.3.6.1.4.1.7165.4.6.2.9.{random_suffix}'
+        if expected_sid is not None:
+            # Append the RID to our OID to ensure more uniqueness.
+            rid = expected_sid.rsplit('-', 1)[1]
+            governs_id += f'.{rid}'
+
         ldif = f'''
 dn: {class_dn}
 objectClass: classSchema
 cn: {class_name}
-governsId: 1.3.6.1.4.1.7165.4.6.2.6.3.{random_suffix}
+governsId: {governs_id}
 subClassOf: top
 possSuperiors: domainDNS
 defaultSecurityDescriptor: O:{code}
diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index 54f48bde20e..d3a1f1c9ad7 100644
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -32,6 +32,7 @@
 ## 1.3.6.1.4.1.7165.4.6.2.6.x - ldap_schema.py
 ## 1.3.6.1.4.1.7165.4.6.2.7.x - dsdb_schema_info.py
 ## 1.3.6.1.4.1.7165.4.6.2.8.x - getnc_schema.py
+## 1.3.6.1.4.1.7165.4.6.2.9.x - sid_strings.py
 
 ## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and standards-track
 #