diff --git a/VIRTUAL_VACATION/tests/test.sh b/VIRTUAL_VACATION/tests/test.sh
index cadfadce..b324c519 100644
--- a/VIRTUAL_VACATION/tests/test.sh
+++ b/VIRTUAL_VACATION/tests/test.sh
@@ -21,12 +21,12 @@ echo "DELETE FROM vacation WHERE email = 'david@example.org'" | psql
 echo
 echo "NONE OF THESE SHOULD RESULT IN MAIL BEING SENT"
 echo 
-cat mailing-list.txt | perl ../vacation.pl -t yes -f fw-general-return-20540-david=example.org@lists.zend.com -- david@example.org
-cat test-email.txt | perl ../vacation.pl -t yes -f david1@example.org -- david@example.org
-cat spam.txt | perl ../vacation.pl -t yes -f mary@ccr.org -- david@example.org
-cat asterisk-email.txt | perl ../vacation.pl -t yes -f www-data@palepurple.net -- david@example.org
-cat facebook.txt | perl ../vacation.pl -t yes -f notification+meynbxsa@facebookmail.com -- david@example.org
-cat mail-myself.txt | perl ../vacation.pl -t yes -f david@example.org -- david@example.org
+cat mailing-list.txt | perl ../vacation.pl -t yes -f fw-general-return-20540-david=example.org@lists.zend.com -- david\#example.org@autoreply.example.org
+cat test-email.txt | perl ../vacation.pl -t yes -f david1@example.org -- david\#example.org@autoreply.example.org
+cat spam.txt | perl ../vacation.pl -t yes -f mary@ccr.org -- david\#example.org@autoreply.example.org
+cat asterisk-email.txt | perl ../vacation.pl -t yes -f www-data@palepurple.net -- david\#example.org@autoreply.example.org
+cat facebook.txt | perl ../vacation.pl -t yes -f notification+meynbxsa@facebookmail.com -- david\#example.org@autoreply.example.org
+cat mail-myself.txt | perl ../vacation.pl -t yes -f david@example.org -- david\#example.org@autoreply.example.org
 
 echo "INSERT INTO vacation (email, subject, body, created, active, domain) VALUES ('david@example.org', 'I am on holiday', 'Yeah, that is right', NOW(), true, 'example.org')" | psql 
 
@@ -34,16 +34,16 @@ echo
 echo "VACATION TURNED ON "
 echo 
 echo "Still ignore mailing list"
-cat mailing-list.txt | perl ../vacation.pl -t yes -f fw-general-return-20540-david=example.org@lists.zend.com -- david@example.org
+cat mailing-list.txt | perl ../vacation.pl -t yes -f fw-general-return-20540-david=example.org@lists.zend.com -- david\#example.org@autoreply.example.org
 echo " * Should send vacation message for this *"
-cat test-email.txt | perl ../vacation.pl -t yes -f david1@example.org -- david@example.org
+cat test-email.txt | perl ../vacation.pl -t yes -f david1@example.org -- david\#example.org@autoreply.example.org
 echo " * Spam - no vacation message for this"
-cat spam.txt | perl ../vacation.pl -t yes -f mary@xxccr.org -- david@example.org
+cat spam.txt | perl ../vacation.pl -t yes -f mary@xxccr.org -- david\#example.org@autoreply.example.org
 echo " * OK - should send vacation message for this"
-cat asterisk-email.txt | perl ../vacation.pl -t yes -f www-data@palepurple.net -- david@example.org
+cat asterisk-email.txt | perl ../vacation.pl -t yes -f www-data@palepurple.net -- david\#example.org@autoreply.example.org
 echo " * Facebook - should not send vacation message for"
-cat facebook.txt | perl ../vacation.pl -t yes -f notification+meynbxsa@facebookmail.com -- david@example.org
+cat facebook.txt | perl ../vacation.pl -t yes -f notification+meynbxsa@facebookmail.com -- david\#example.org@autoreply.example.org
 echo " * Mailing myself - should not send vacation message"
-cat mail-myself.txt | perl ../vacation.pl -t yes -f david@example.org -- david@example.org
+cat mail-myself.txt | perl ../vacation.pl -t yes -f david@example.org -- david\#example.org@autoreply.example.org
 echo
 echo