6 files changed, 24 insertions, 3 deletions
diff --git a/test/confs/0015 b/test/confs/0015
index 8c62e2e08..b1472da06 100644
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -83,7 +83,8 @@ local_delivery:
   file = DIR/test-mail/${bless:$local_part}
   return_path_add
   headers_add = X-local_part: $local_part\n\
-                X-local_part_prefix: $local_part_prefix
+                X-local_part_prefix: $local_part_prefix\n\
+                X-local_part_prefix_v: $local_part_prefix_v
 
 local_delivery_b:
   driver = appendfile
@@ -94,7 +95,8 @@ local_delivery_b:
   return_path_add
   use_bsmtp
   headers_add = X-local_part: $local_part\n\
-                X-local_part_prefix: $local_part_prefix
+                X-local_part_prefix: $local_part_prefix\n\
+                X-local_part_prefix_v: $local_part_prefix_v
 
 delivery_s:
   driver = smtp
diff --git a/test/confs/0016 b/test/confs/0016
index dcc005f0b..9e190d8eb 100644
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -39,8 +39,11 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  headers_add = X-local_part: $local_part\n\
+		X-local_part_suffix: $local_part_suffix\n\
+		X-local_part_suffix_v: $local_part_suffix_v
   return_path_add
+  file = DIR/test-mail/${bless:$local_part}
 
 address_reply:
   driver = autoreply
diff --git a/test/mail/0015.CALLER b/test/mail/0015.CALLER
index aa2e0d9ca..e01024b97 100644
--- a/test/mail/0015.CALLER
+++ b/test/mail/0015.CALLER
@@ -17,6 +17,7 @@ Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: CALLER
 X-local_part_prefix: 
+X-local_part_prefix_v: 
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: text/plain; charset=us-ascii
@@ -73,6 +74,7 @@ Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: CALLER
 X-local_part_prefix: 
+X-local_part_prefix_v: 
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: text/plain; charset=us-ascii
diff --git a/test/mail/0015.userx b/test/mail/0015.userx
index 29b1e9a95..870f58015 100644
--- a/test/mail/0015.userx
+++ b/test/mail/0015.userx
@@ -11,6 +11,7 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: page+
+X-local_part_prefix_v: page
 
 Some message text.
 
@@ -30,6 +31,7 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: 
+X-local_part_prefix_v: 
 
 callpager -r 108 PAGE:Some message text. 
 
@@ -46,6 +48,7 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: page+
+X-local_part_prefix_v: page
 
 Some more message text.
 
@@ -65,6 +68,7 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: 
+X-local_part_prefix_v: 
 
 callpager -r 108 PAGE:Some more message text. 
 
@@ -83,6 +87,7 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: b+
+X-local_part_prefix_v: 
 
 Text.
 .
@@ -100,6 +105,7 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: 
+X-local_part_prefix_v: 
 
 .
 MAIL FROM:<CALLER@test.ex>
@@ -116,5 +122,6 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: x+
+X-local_part_prefix_v: x
 
 .
diff --git a/test/mail/0016.userx b/test/mail/0016.userx
index 8e33c3631..5889f68ed 100644
--- a/test/mail/0016.userx
+++ b/test/mail/0016.userx
@@ -9,6 +9,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-local_part: userx
+X-local_part_suffix: +page
+X-local_part_suffix_v: page
 
 Some message text.
 
@@ -26,6 +29,9 @@ Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-local_part: userx
+X-local_part_suffix: 
+X-local_part_suffix_v: 
 
 callpager -r 108 PAGE:Some message text. 
 
diff --git a/test/scripts/0000-Basic/0016 b/test/scripts/0000-Basic/0016
index d2b07d281..a3cf1168c 100644
--- a/test/scripts/0000-Basic/0016
+++ b/test/scripts/0000-Basic/0016
@@ -1,3 +1,4 @@
 # local part suffix
 exim -odi userx+page
 Some message text.
+****