diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf
index d4ea9e0aa1..74e846f3a9 100644
--- a/tests/data/slapd-relay.conf
+++ b/tests/data/slapd-relay.conf
@@ -48,7 +48,11 @@ relay		"dc=example,dc=com" massage
 
 database	relay
 suffix		"o=Esempio,c=IT"
-relay		"dc=example,dc=com" massage
+# relay		"dc=example,dc=com" massage
+# use this alternate form, which causes the target database
+# to be selected after DN massaging
+overlay		rwm
+rwm-suffixmassage	"o=Esempio,c=IT" "dc=example,dc=com"
 
 database	relay
 suffix		"o=Beispiel,c=DE"