4 files changed, 150 insertions, 2 deletions
diff --git a/test/scripts/0000-Basic/0497 b/test/scripts/0000-Basic/0497
index 1465afec4..8e7e54967 100644
--- a/test/scripts/0000-Basic/0497
+++ b/test/scripts/0000-Basic/0497
@@ -1,5 +1,22 @@
-# rcpt_4xx from server with no retry
+# mail_4xx, rcpt_4xx, data_4xx, lost_connection
 need_ipv4
+# MAIL, no pipelining
+#
+server PORT_S
+220 Server ready
+EHLO
+250-server id
+250 OK
+MAIL FROM
+452 temporary error
+QUIT
+250 OK
+****
+exim -odi userx@x.y
+****
+dump retry
+sudo rm DIR/spool/db/*
+# RCPT, no pipelining
 #
 server PORT_S
 220 Server ready
@@ -16,4 +33,127 @@ QUIT
 exim -odi userx@x.y
 ****
 dump retry
-no_message_check
+# DATA start, no pipelining
+#
+server PORT_S
+220 Server ready
+EHLO
+250-server id
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+DATA
+452 temporary error
+QUIT
+250 OK
+****
+exim -odi userx@x.y
+****
+# DATA end, no pipelining
+#
+server PORT_S
+220 Server ready
+EHLO
+250-server id
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+DATA
+352 GO AHEAD
+.
+452 temporary error
+QUIT
+250 OK
+****
+exim -odi userx@x.y
+****
+# MAIL, pipelining
+#
+server PORT_S
+220 Server ready
+EHLO
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM
+452 temporary error
+QUIT
+250 OK
+****
+exim -odi userx@x.y
+****
+# RCPT, pipelining
+#
+server PORT_S
+220 Server ready
+EHLO
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+452 temporary error
+QUIT
+250 OK
+****
+exim -odi userx@x.y
+****
+# DATA start, pipelining
+#
+server PORT_S
+220 Server ready
+EHLO
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+DATA
+452 temporary error
+QUIT
+250 OK
+****
+exim -odi userx@x.y
+****
+# DATA end, pipelining
+#
+server PORT_S
+220 Server ready
+EHLO
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+DATA
+352 GO AHEAD
+.
+452 temporary error
+QUIT
+250 OK
+****
+exim -odi userx@x.y
+****
+# lost connection
+#
+server PORT_S
+220 Server ready
+EHLO
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+****
+exim -odi userx@x.y
+****
diff --git a/test/scripts/2000-GnuTLS/2010 b/test/scripts/2000-GnuTLS/2010
index 06e259567..02c82ea79 100644
--- a/test/scripts/2000-GnuTLS/2010
+++ b/test/scripts/2000-GnuTLS/2010
@@ -7,5 +7,7 @@ Test message
 ****
 exim -qf
 ****
+exim -DHOSTS=127.0.0.1 -qf
+****
 killdaemon
 no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2110 b/test/scripts/2100-OpenSSL/2110
index fe197fabd..e8a55353a 100644
--- a/test/scripts/2100-OpenSSL/2110
+++ b/test/scripts/2100-OpenSSL/2110
@@ -6,5 +6,7 @@ Test message
 ****
 exim -qf
 ****
+exim -DHOSTS=127.0.0.1 -qf
+****
 killdaemon
 no_msglog_check
diff --git a/test/scripts/5100-lmtp-transport/5100 b/test/scripts/5100-lmtp-transport/5100
index 224943d44..36f45e1ab 100644
--- a/test/scripts/5100-lmtp-transport/5100
+++ b/test/scripts/5100-lmtp-transport/5100
@@ -36,4 +36,8 @@ exim -odi -DIGNORE_QUOTA=true jack jill
 script: 09
 This is a test message.
 ****
+exim -odi userx usery
+script: 10
+This is a test message.
+****
 no_msglog_check