diff --git a/selftest/knownfail b/selftest/knownfail
index de7e920de08..38b5f51bb36 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -306,4 +306,3 @@
 ^samba4.rpc.echo.*on.*with.object.echo.sinkdata.*nt4_dc
 ^samba4.rpc.echo.*on.*with.object.echo.addone.*nt4_dc
 ^samba4.rpc.echo.*on.*ncacn_ip_tcp.*with.object.*nt4_dc
-^samba4.blackbox.tombstones-expunge.release-4-5-0-pre1.tombstones_expunge
diff --git a/source4/dsdb/kcc/garbage_collect_tombstones.c b/source4/dsdb/kcc/garbage_collect_tombstones.c
index ad14d5e55bb..1909cfeff76 100644
--- a/source4/dsdb/kcc/garbage_collect_tombstones.c
+++ b/source4/dsdb/kcc/garbage_collect_tombstones.c
@@ -193,8 +193,9 @@ static NTSTATUS garbage_collect_tombstones_part(TALLOC_CTX *mem_ctx,
 
 				guid_buf_str = GUID_buf_string(&guid, &buf_guid);
 				guid_search_str = talloc_asprintf(mem_ctx,
-								  "<GUID=%s>",
-								  guid_buf_str);
+								  "<GUID=%s>;%s",
+								  guid_buf_str,
+								  dsdb_dn_get_linearized(mem_ctx, dn));
 				cleanup_val = data_blob_string_const(guid_search_str);
 
 				talloc_free(dn);