2 files changed, 34 insertions, 13 deletions
diff --git a/test/scripts/0000-Basic/0580 b/test/scripts/0000-Basic/0580
index 8d8a11751..5cce3e858 100644
--- a/test/scripts/0000-Basic/0580
+++ b/test/scripts/0000-Basic/0580
@@ -19,7 +19,7 @@ QUIT
 221 Bye
 ****
 #
-exim -bs
+exim -bs -odi
 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 data
@@ -29,7 +29,6 @@ body
 .
 quit
 ****
-sleep 1
 #
 #
 # multiple recipients
@@ -62,7 +61,7 @@ QUIT
 221 Bye
 ****
 #
-exim -bs
+exim -bs -odi
 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 rcpt to:<usery2@test.ex>
@@ -73,7 +72,6 @@ body
 .
 quit
 ****
-sleep 1
 #
 #
 # 2nd callout result is cached (above); should not activate LCC
@@ -105,7 +103,7 @@ QUIT
 221 Bye
 ****
 #
-exim -bs
+exim -bs -odi
 mail from:<userx@ok.example>
 rcpt to:<usery3@test.ex>
 rcpt to:<usery@test.ex>
@@ -116,7 +114,6 @@ body
 .
 quit
 ****
-sleep 1
 #
 #
 # no cache hits; should do LCC
@@ -138,7 +135,7 @@ QUIT
 221 Bye
 ****
 #
-exim -bs
+exim -bs -odi
 mail from:<userx@ok.example>
 rcpt to:<usery4@test.ex>
 rcpt to:<usery5@test.ex>
@@ -149,8 +146,33 @@ body
 .
 quit
 ****
-sleep 1
 #
+# cmdline -bs send, rmt conn timeout, also local rcpt
+server PORT_S
+220 Welcome
+EHLO
+250 Hi
+MAIL FROM
+250 OK 
+RCPT TO
+250 OK
+DATA
+354 hit me
+.
+250 message accepted
+QUIT
+221 bye
+****
+exim -bs -odi
+mail from:<useri@ok.example>
+rcpt to:<remote@test.ex>
+rcpt to:<local@test.ex>
+data
+Subject: test
+.
+quit
+****
+exim -bp
+****
 #
-no_stdout_check
 no_msglog_check
diff --git a/test/scripts/0000-Basic/0582 b/test/scripts/0000-Basic/0582
index 3eefcc979..6da20235a 100644
--- a/test/scripts/0000-Basic/0582
+++ b/test/scripts/0000-Basic/0582
@@ -15,12 +15,11 @@ QUIT
 221 Bye
 ****
 #
-exim -bs
+exim -bs -odi
 mail from:<userg@ok.example>
 rcpt to:<userg@test.ex>
 quit
 ****
-sleep 1
 #
 # cmdline -bs send, data-time defer
 server PORT_S
@@ -39,7 +38,7 @@ QUIT
 221 Bye
 ****
 #
-exim -bs
+exim -bs -odi
 mail from:<userh@ok.example>
 rcpt to:<userh@test.ex>
 data
@@ -49,7 +48,7 @@ body
 .
 quit
 ****
-sleep 1
+#
 #
 #
 no_stdout_check