diff --git a/selftest/knownfail.d/samba4.rpc.netlogon b/selftest/knownfail.d/samba4.rpc.netlogon
deleted file mode 100644
index 12d871e7014..00000000000
--- a/selftest/knownfail.d/samba4.rpc.netlogon
+++ /dev/null
@@ -1,9 +0,0 @@
-^samba4.rpc.netlogon.on.ncacn_np.with.seal,padcheck.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
-^samba4.rpc.netlogon.on.ncacn_ip_tcp.with.seal,padcheck.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
-^samba4.rpc.netlogon.on.ncacn_np.with.validate.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
-^samba4.rpc.netlogon.on.ncacn_ip_tcp.with.validate.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
-^samba4.rpc.netlogon.on.ncacn_np.with.bigendian.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
-^samba4.rpc.netlogon.on.ncacn_ip_tcp.with.bigendian.netlogon.GetDomainInfo\(ad_dc_ntvfs\)
-^samba4.rpc.netlogon.with.seal,padcheck.netlogon.GetDomainInfo\(ad_dc\)
-^samba4.rpc.netlogon.with.validate.netlogon.GetDomainInfo\(ad_dc\)
-^samba4.rpc.netlogon.with.bigendian.netlogon.GetDomainInfo\(ad_dc\)
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index f0c8f60ac90..e930d9048e7 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -2598,9 +2598,14 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
 							 os_version->BuildNumber);
 			NT_STATUS_HAVE_NO_MEMORY(os_version_str);
 
-			ret = ldb_msg_add_string(new_msg,
-						 "operatingSystemServicePack",
-						 os_version->CSDVersion);
+			if (strlen(os_version->CSDVersion) != 0) {
+				ret = ldb_msg_add_string(new_msg,
+							 "operatingSystemServicePack",
+							 os_version->CSDVersion);
+			} else {
+				ret = samdb_msg_add_delete(sam_ctx, mem_ctx, new_msg,
+							   "operatingSystemServicePack");
+			}
 			if (ret != LDB_SUCCESS) {
 				return NT_STATUS_NO_MEMORY;
 			}