diff --git a/tests/data/acl.out.master b/tests/data/acl.out.master
index a199068b81..967a64073c 100644
--- a/tests/data/acl.out.master
+++ b/tests/data/acl.out.master
@@ -200,7 +200,6 @@ objectclass: organization
 objectclass: domainRelatedObject
 l: Ann Arbor, Michigan
 st: Michigan
-streetaddress: 535 West William St.
 o: University of Michigan
 o: UMICH
 o: UM
diff --git a/tests/data/modify.out.master b/tests/data/modify.out.master
index 25fab50ad7..429d901fa6 100644
--- a/tests/data/modify.out.master
+++ b/tests/data/modify.out.master
@@ -264,7 +264,6 @@ objectclass: organization
 objectclass: domainRelatedObject
 l: Ann Arbor, Michigan
 st: Michigan
-streetaddress: 535 West William St.
 o: University of Michigan
 o: UMICH
 o: UM
diff --git a/tests/data/modrdn.out.master b/tests/data/modrdn.out.master
index d237d793e4..3e794d32c4 100644
--- a/tests/data/modrdn.out.master
+++ b/tests/data/modrdn.out.master
@@ -284,7 +284,6 @@ objectclass: organization
 objectclass: domainRelatedObject
 l: Ann Arbor, Michigan
 st: Michigan
-streetaddress: 535 West William St.
 o: University of Michigan
 o: UMICH
 o: UM
diff --git a/tests/data/modrdn.out.master.0 b/tests/data/modrdn.out.master.0
index d237d793e4..3e794d32c4 100644
--- a/tests/data/modrdn.out.master.0
+++ b/tests/data/modrdn.out.master.0
@@ -284,7 +284,6 @@ objectclass: organization
 objectclass: domainRelatedObject
 l: Ann Arbor, Michigan
 st: Michigan
-streetaddress: 535 West William St.
 o: University of Michigan
 o: UMICH
 o: UM
diff --git a/tests/data/search.out.master b/tests/data/search.out.master
index 7c284b576a..ebadd3d27c 100644
--- a/tests/data/search.out.master
+++ b/tests/data/search.out.master
@@ -253,7 +253,6 @@ objectclass: organization
 objectclass: domainRelatedObject
 l: Ann Arbor, Michigan
 st: Michigan
-streetaddress: 535 West William St.
 o: University of Michigan
 o: UMICH
 o: UM
diff --git a/tests/data/test-ordered.ldif b/tests/data/test-ordered.ldif
index cb17adf892..fdaab5d03c 100644
--- a/tests/data/test-ordered.ldif
+++ b/tests/data/test-ordered.ldif
@@ -4,7 +4,6 @@ objectclass: organization
 objectclass: domainRelatedObject
 l: Ann Arbor, Michigan
 st: Michigan
-streetaddress: 535 West William St.
 o: University of Michigan
 o: UMICH
 o: UM
diff --git a/tests/data/test.ldif b/tests/data/test.ldif
index 9c1c697914..919bdd6726 100644
--- a/tests/data/test.ldif
+++ b/tests/data/test.ldif
@@ -283,7 +283,6 @@ objectclass: organization
 objectclass: domainRelatedObject
 l: Ann Arbor, Michigan
 st: Michigan
-streetaddress: 535 West William St.
 o: University of Michigan
 o: UMICH
 o: UM