From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Thu, 28 Jan 2016 21:20:33 +0000 (+0100)
Subject: Fix CVE-2016-1531
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/451686a85b4706616f8233a6ac306318f7a56cf6

Fix CVE-2016-1531

Add keep_environment, add_environment.
Change the working directory to "/" during the early startup
phase.

(cherry picked from commit 4af6f9baeffc937b4de28b9ce371e697a1609632)
  (cherry picked from commit 0c8892dc00bf2223dffe18be12f07d8c4549b913)
    (cherry picked from commit fa927caf12b309a2c984ddff1adf4a299186d887)
      (cherry picked from commit bc3c7bb7d4aba3e563434e5627fe1f2176aa18c0)
  	(cherry picked from commit 2b92b67bfc33efe05e6ff2ea3852731ac2273832)
  	(cherry picked from commit 14b82c8b736c8ed24eda144f57703cb9feac6323)
  	(cherry picked from commit 9ca92d0c6e9c6f161bd8111366c6952d3a9315e2)
  	(cherry picked from commit 0020c6d9ecfd98ed7b2b337ed4f898fdc409784b)
  	(cherry picked from commit e8f96966360ea8867ad6a8b5affda6c37fa4958c)
  	(cherry picked from commit ef6fb807c1e1a665f444f644c60c77269f7c5209)
---

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index c71dfda73..0068b2f73 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -3160,6 +3160,11 @@ using one of the words &%router_list%&, &%transport_list%&, or
 settings can be obtained by using &%routers%&, &%transports%&, or
 &%authenticators%&.
 
+.cindex "environment"
+If &%environment%& is given as an argument, the set of environment
+variables is output, line by line. Using the &%-n%& flag supresses the value of the
+variables.
+
 .cindex "options" "macro &-- extracting"
 If invoked by an admin user, then &%macro%&, &%macro_list%& and &%macros%&
 are available, similarly to the drivers.  Because macros are sometimes used
@@ -3491,6 +3496,8 @@ name, but it can be a colon-separated list of names. In this case, the first
 file that exists is used. Failure to open an existing file stops Exim from
 proceeding any further along the list, and an error is generated.
 
+The file names need to be absolute names.
+
 When this option is used by a caller other than root, and the list is different
 from the compiled-in list, Exim gives up its root privilege immediately, and
 runs with the real and effective uid and gid set to those of the caller.
@@ -7570,7 +7577,7 @@ general facilities that apply to all four kinds of list.
 
 
 
-.section "Expansion of lists" "SECID75"
+.section "Expansion of lists" "SECTlistexpand"
 .cindex "expansion" "of lists"
 Each list is expanded as a single string before it is used. The result of
 expansion must be a list, possibly containing empty items, which is split up
@@ -13353,6 +13360,14 @@ received. See chapter &<<CHAPACL>>& for further details.
 This option defines the ACL that is run when an SMTP VRFY command is
 received. See chapter &<<CHAPACL>>& for further details.
 
+.new
+.option add_environment main "string list" empty
+.cindex "environment" "inherited"
+This option allows to set individual environment variables that the
+currently linked libraries and programs in child processes use. The
+default list is empty,
+.wen
+
 .option admin_groups main "string list&!!" unset
 .cindex "admin user"
 This option is expanded just once, at the start of Exim's processing. If the
@@ -14354,6 +14369,30 @@ process rather than a remote host, and is using &%-bs%& to inject the messages,
 .option ignore_fromline_local main boolean false
 See &%ignore_fromline_hosts%& above.
 
+.new
+.option keep_environment main "string list" unset
+.cindex "environment" "inherited"
+This option contains a string list of environment variables to keep.
+You have to trust these variables or you have to be sure that
+these variables do not impose any security risk. Keep in mind that
+during the startup phase Exim is running with an effective UID 0 in most
+installations. As the default value is an empty list, the default
+environment for using libraries, running embedded Perl code, or running
+external binaries is empty, and does not not even contain PATH or HOME.
+
+Actually the list is interpreted as a list of patterns
+(&<<SECTlistexpand>>&), except that it is not expanded first.
+
+WARNING: Macro substitution is still done first, so having a macro
+FOO and having FOO_HOME in your &%keep_environment%& option may have
+unexpected results. You may work around this using a regular expression
+that does not match the macro name: ^[F]OO_HOME$.
+
+Current versions of Exim issue a warning during startupif you do not mention
+&%keep_environment%& or &%add_environment%& in your runtime configuration
+file.
+.wen
+
 
 .option keep_malformed main time 4d
 This option specifies the length of time to keep messages whose spool files
@@ -15375,6 +15414,12 @@ it qualifies them only if the message came from a host that matches
 &%sender_unqualified_hosts%&, or if the message was submitted locally (not
 using TCP/IP), and the &%-bnq%& option was not set.
 
+.option set_environment main "string list" empty
+.cindex "environment"
+This option allows to set individual environment variables that the
+currently linked libraries and programs in child processes use. The
+default list is empty,
+
 
 .option smtp_accept_keepalive main boolean true
 .cindex "keepalive" "on incoming connection"
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 928f377b1..a2ba08d35 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,6 +1,7 @@
 Change log file for Exim from version 4.21
 -------------------------------------------
 
+HS/04 Add support for keep_environment and add_environment options.
 Exim version 4.82
 -----------------
 
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 1500e85ec..4dc9face0 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -313,6 +313,7 @@ OBJ_EXIM = acl.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \
         rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o \
         route.o search.o sieve.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
         std-crypto.o store.o string.o tls.o tod.o transport.o tree.o verify.o \
+        environment.o \
         $(OBJ_LOOKUPS) \
         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
         $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)
@@ -549,6 +550,7 @@ dns.o:           $(HDRS) dns.c
 enq.o:           $(HDRS) enq.c
 exim.o:          $(HDRS) exim.c
 expand.o:        $(HDRS) expand.c
+environment.o:   $(HDRS) environment.c
 filter.o:        $(HDRS) filter.c
 filtertest.o:    $(HDRS) filtertest.c
 globals.o:       $(HDRS) globals.c
diff --git a/src/src/environment.c b/src/src/environment.c
new file mode 100644
index 000000000..aaa84f817
--- /dev/null
+++ b/src/src/environment.c
@@ -0,0 +1,54 @@
+/*************************************************
+*     Exim - an Internet mail transport agent    *
+*************************************************/
+
+/* Copyright (c) Heiko Schlittermann 2016
+ * hs@schlittermann.de
+ * See the file NOTICE for conditions of use and distribution.
+ */
+
+#include "exim.h"
+
+/* The cleanup_environment() function is used during the startup phase
+of the Exim process, right after reading the configurations main
+part, before any expansions take place. It retains the environment
+variables we trust (via the keep_environment option) and allows to
+set additional variables (via add_environment).
+
+Returns:    TRUE if successful
+            FALSE otherwise
+*/
+
+BOOL
+cleanup_environment()
+{
+if (!keep_environment || *keep_environment == '\0')
+  clearenv();
+else if (Ustrcmp(keep_environment, "*") != 0)
+  {
+  uschar **p;
+  if (environ) for (p = USS environ; *p; /* see below */)
+    {
+    uschar *name = string_copyn(*p, US Ustrchr(*p, '=') - *p);
+
+    if (OK != match_isinlist(name, CUSS &keep_environment,
+        0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
+      if (unsetenv(CS name) < 0) return FALSE;
+      else /* nothing */;
+    else
+      p++;
+
+    store_reset(name);
+    }
+  }
+if (add_environment)
+  {
+    uschar *p;
+    int sep = 0;
+    const uschar* envlist = add_environment;
+    while ((p = string_nextinlist(&envlist, &sep, NULL, 0)))
+        putenv(CS p);
+  }
+
+  return TRUE;
+}
diff --git a/src/src/exim.c b/src/src/exim.c
index a715c0b39..807f1ea87 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -3648,8 +3648,19 @@ init_lookup_list();
 is a failure. It leaves the configuration file open so that the subsequent
 configuration data for delivery can be read if needed. */
 
+/* To be safe: change the working directory to /. */
+if (Uchdir("/") < 0)
+  {
+    perror("exim: chdir `/': ");
+    exit(EXIT_FAILURE);
+  }
+
 readconf_main();
 
+if (cleanup_environment() == FALSE)
+  log_write(0, LOG_PANIC_DIE, "Can't cleanup environment");
+
+
 /* If an action on specific messages is requested, or if a daemon or queue
 runner is being started, we need to know if Exim was called by an admin user.
 This is the case if the real user is root or exim, or if the real group is
@@ -3795,7 +3806,7 @@ TMPDIR macro, if this macro is defined. */
 #ifdef TMPDIR
   {
   uschar **p;
-  for (p = USS environ; *p != NULL; p++)
+  if (environ) for (p = USS environ; *p != NULL; p++)
     {
     if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&
         Ustrcmp(*p+7, TMPDIR) != 0)
@@ -3835,10 +3846,10 @@ else
     uschar **new;
     uschar **newp;
     int count = 0;
-    while (*p++ != NULL) count++;
+    if (environ) while (*p++ != NULL) count++;
     if (envtz == NULL) count++;
     newp = new = malloc(sizeof(uschar *) * (count + 1));
-    for (p = USS environ; *p != NULL; p++)
+    if (environ) for (p = USS environ; *p != NULL; p++)
       {
       if (Ustrncmp(*p, "TZ=", 3) == 0) continue;
       *newp++ = *p;
@@ -4428,7 +4439,8 @@ if (list_options)
           (Ustrcmp(argv[i], "router") == 0 ||
            Ustrcmp(argv[i], "transport") == 0 ||
            Ustrcmp(argv[i], "authenticator") == 0 ||
-           Ustrcmp(argv[i], "macro") == 0))
+           Ustrcmp(argv[i], "macro") == 0 ||
+           Ustrcmp(argv[i], "environment") == 0))
         {
         readconf_print(argv[i+1], argv[i], flag_n);
         i++;
diff --git a/src/src/functions.h b/src/src/functions.h
index d381b569a..b54b42159 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -76,6 +76,7 @@ extern int     check_host(void *, uschar *, uschar **, uschar **);
 extern uschar **child_exec_exim(int, BOOL, int *, BOOL, int, ...);
 extern pid_t   child_open_uid(uschar **, uschar **, int, uid_t *, gid_t *,
                  int *, int *, uschar *, BOOL);
+extern BOOL    cleanup_environment(void);
 extern uschar *cutthrough_finaldot(void);
 extern BOOL    cutthrough_flush_send(void);
 extern BOOL    cutthrough_headers_send(void);
@@ -350,6 +351,7 @@ extern int     stdin_ungetc(int);
 extern uschar *string_append(uschar *, int *, int *, int, ...);
 extern uschar *string_base62(unsigned long int);
 extern uschar *string_cat(uschar *, int *, int *, const uschar *, int);
+extern int     string_compare_by_pointer(const uschar **, const uschar **);
 extern uschar *string_copy_dnsdomain(uschar *);
 extern uschar *string_copy_malloc(uschar *);
 extern uschar *string_copylc(uschar *);
diff --git a/src/src/globals.c b/src/src/globals.c
index 133a7bf74..e5ac8d679 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -296,6 +296,7 @@ BOOL    active_local_from_check = FALSE;
 BOOL    active_local_sender_retain = FALSE;
 int     body_8bitmime = 0;
 BOOL    accept_8bitmime        = TRUE; /* deliberately not RFC compliant */
+uschar *add_environment        = NULL;
 address_item  *addr_duplicate  = NULL;
 
 address_item address_defaults = {
@@ -739,6 +740,8 @@ uschar *iterate_item           = NULL;
 
 int     journal_fd             = -1;
 
+uschar *keep_environment       = NULL;
+
 int     keep_malformed         = 4*24*60*60;    /* 4 days */
 
 uschar *eldap_dn               = NULL;
diff --git a/src/src/globals.h b/src/src/globals.h
index 265f94e60..9c7238212 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -137,6 +137,7 @@ extern uschar **address_expansions[ADDRESS_EXPANSIONS_COUNT];
 /* General global variables */
 
 extern BOOL    accept_8bitmime;        /* Allow *BITMIME incoming */
+extern uschar *add_environment;        /* List of environment variables to add */
 extern int     body_8bitmime;          /* sender declared BODY= ; 7=7BIT, 8=8BITMIME */
 extern header_line *acl_added_headers; /* Headers added by an ACL */
 extern tree_node *acl_anchor;          /* Tree of named ACLs */
@@ -470,6 +471,7 @@ extern uschar *iterate_item;           /* Item from iterate list */
 
 extern int     journal_fd;             /* Fd for journal file */
 
+extern uschar *keep_environment;       /* Whitelist for environment variables */
 extern int     keep_malformed;         /* Time to keep malformed messages */
 
 extern uschar *eldap_dn;               /* Where LDAP DNs are left */
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 77c798412..d64721248 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -162,6 +162,7 @@ static optionlist optionlist_config[] = {
   { "acl_smtp_starttls",        opt_stringptr,   &acl_smtp_starttls },
 #endif
   { "acl_smtp_vrfy",            opt_stringptr,   &acl_smtp_vrfy },
+  { "add_environment",          opt_stringptr,   &add_environment },
   { "admin_groups",             opt_gidlist,     &admin_groups },
   { "allow_domain_literals",    opt_bool,        &allow_domain_literals },
   { "allow_mx_to_ip",           opt_bool,        &allow_mx_to_ip },
@@ -270,6 +271,7 @@ static optionlist optionlist_config[] = {
   { "ignore_bounce_errors_after", opt_time,      &ignore_bounce_errors_after },
   { "ignore_fromline_hosts",    opt_stringptr,   &ignore_fromline_hosts },
   { "ignore_fromline_local",    opt_bool,        &ignore_fromline_local },
+  { "keep_environment",         opt_stringptr,   &keep_environment },
   { "keep_malformed",           opt_time,        &keep_malformed },
 #ifdef LOOKUP_LDAP
   { "ldap_ca_cert_dir",         opt_stringptr,   &eldap_ca_cert_dir },
@@ -2473,6 +2475,7 @@ second argument is NULL. There are some special values:
   macro_list         print a list of macro names
   +name              print a named list item
   local_scan         print the local_scan options
+  environment        print the used execution environment
 
 If the second argument is not NULL, it must be one of "router", "transport",
 "authenticator" or "macro" in which case the first argument identifies the
@@ -2614,6 +2617,25 @@ if (type == NULL)
     names_only = TRUE;
     }
 
+  else if (Ustrcmp(name, "environment") == 0)
+    {
+    if (environ)
+      {
+      uschar **p;
+      size_t n;
+      for (p = USS environ; *p; p++) ;
+      n = p - USS environ;
+      qsort(environ, p - USS environ, sizeof(*p), (__compar_fn_t) string_compare_by_pointer);
+
+      for (p = USS environ; *p; p++)
+        {
+        if (no_labels) *(Ustrchr(*p, '=')) = '\0';
+        puts(*p);
+        }
+      }
+    return;
+    }
+
   else
     {
     print_ol(find_option(name, optionlist_config, optionlist_config_size),
@@ -2927,6 +2949,15 @@ uschar *list = config_main_filelist;
 while((filename = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))
        != NULL)
   {
+
+  /* To avoid confusion: Exim changes to / at the very beginning and
+   * and to $spool_directory later. */
+  if (filename[0] != '/')
+    {
+    fprintf(stderr, "-C %s: only absolute names are allowed\n", filename);
+    exit(EXIT_FAILURE);
+  }
+
   /* Cut out all the fancy processing unless specifically wanted */
 
   #if defined(CONFIGURE_FILE_USE_NODE) || defined(CONFIGURE_FILE_USE_EUID)
@@ -3362,6 +3393,11 @@ if (openssl_options != NULL)
 # endif
   }
 #endif
+
+if ((!add_environment || *add_environment == '\0') && !keep_environment)
+  log_write(0, LOG_MAIN,
+      "WARNING: purging the environment.\n"
+      " Suggested action: use keep_environment and add_environment.\n");
 }
 
 
diff --git a/src/src/string.c b/src/src/string.c
index 0e73e2c79..145a6bd11 100644
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -1589,6 +1589,17 @@ return yield;
 #endif  /* COMPILE_UTILITY */
 
 
+#ifndef COMPILE_UTILITY
+/* qsort(3), currently used to sort the environment variables
+for -bP environment output, needs a function to compare two pointers to string
+pointers. Here it is. */
+
+int
+string_compare_by_pointer(const uschar **a, const uschar **b)
+{
+return Ustrcmp(CUS *a, CUS *b);
+}
+#endif /* COMPILE_UTILITY */
 
 
 
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index b273fff75..9079b8313 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -574,7 +574,7 @@ if (running_in_test_harness)
   {
   extern char ** environ;
   uschar ** p;
-  for (p = USS environ; *p != NULL; p++)
+    if (environ) for (p = USS environ; *p != NULL; p++)
     if (Ustrncmp(*p, "EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK", 42) == 0)
       {
       DEBUG(D_tls) debug_printf("Supplying known bad OCSP response\n");
diff --git a/test/confs/0000 b/test/confs/0000
index 25474a063..226ffc3f0 100644
--- a/test/confs/0000
+++ b/test/confs/0000
@@ -3,10 +3,10 @@
 # This configuration is used when the test script is finding out what features
 # are in the Exim binary. It needs to discover where the test suite's spool
 # directory is going to be.
-
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+keep_environment =
 
 # End
diff --git a/test/confs/0001 b/test/confs/0001
index 14db5ae26..5ca7155d5 100644
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -5,6 +5,7 @@
 # mess up the creation of the spool directory etc.
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0002 b/test/confs/0002
index 409bd755f..d404c6641 100644
--- a/test/confs/0002
+++ b/test/confs/0002
@@ -4,6 +4,7 @@ LENCHECK=
 PTBC=
 
 exim_path = EXIM_PATH
+keep_environment = USER
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0003 b/test/confs/0003
index 53ae39052..199dbf210 100644
--- a/test/confs/0003
+++ b/test/confs/0003
@@ -1,6 +1,7 @@
 # Exim test configuration 0003
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0004 b/test/confs/0004
index 606ab5133..7d40877c6 100644
--- a/test/confs/0004
+++ b/test/confs/0004
@@ -1,6 +1,7 @@
 # Exim test configuration 0004
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0005 b/test/confs/0005
index d4e976e81..31b490b3a 100644
--- a/test/confs/0005
+++ b/test/confs/0005
@@ -1,6 +1,7 @@
 # Exim test configuration 0005
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0006 b/test/confs/0006
index 59ecb0e2c..d2f089455 100644
--- a/test/confs/0006
+++ b/test/confs/0006
@@ -1,6 +1,7 @@
 # Exim test configuration 0006
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0007 b/test/confs/0007
index 1dc7f574b..5f15a51fd 100644
--- a/test/confs/0007
+++ b/test/confs/0007
@@ -1,6 +1,7 @@
 # Exim test configuration 0007
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0008 b/test/confs/0008
index 2c6b34189..a2fa7861f 100644
--- a/test/confs/0008
+++ b/test/confs/0008
@@ -1,6 +1,7 @@
 # Exim test configuration 0008
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0009 b/test/confs/0009
index 0d944c9da..6482e50aa 100644
--- a/test/confs/0009
+++ b/test/confs/0009
@@ -1,6 +1,7 @@
 # Exim test configuration 0009
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0010 b/test/confs/0010
index f39a50b8b..79bea750b 100644
--- a/test/confs/0010
+++ b/test/confs/0010
@@ -1,6 +1,7 @@
 # Exim test configuration 0010
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0011 b/test/confs/0011
index ca101e0e1..1dc06f5eb 100644
--- a/test/confs/0011
+++ b/test/confs/0011
@@ -1,6 +1,7 @@
 # Exim test configuration 0011
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0012 b/test/confs/0012
index 4e1d4730b..d6144a2dd 100644
--- a/test/confs/0012
+++ b/test/confs/0012
@@ -1,6 +1,7 @@
 # Exim test configuration 0012
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0013 b/test/confs/0013
index 70cd8d6ed..09c3990b6 100644
--- a/test/confs/0013
+++ b/test/confs/0013
@@ -1,6 +1,7 @@
 # Exim test configuration 0013
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0014 b/test/confs/0014
index c7dbdb804..b1bfec2fa 100644
--- a/test/confs/0014
+++ b/test/confs/0014
@@ -1,6 +1,7 @@
 # Exim test configuration 0014
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0015 b/test/confs/0015
index fbfa534df..76249cc26 100644
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -1,6 +1,7 @@
 # Exim test configuration 0015
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0016 b/test/confs/0016
index 2d5a9dfc2..b8b516462 100644
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -1,6 +1,7 @@
 # Exim test configuration 0016
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0017 b/test/confs/0017
index 48c3e9c4d..8f9b72ce6 100644
--- a/test/confs/0017
+++ b/test/confs/0017
@@ -1,6 +1,7 @@
 # Exim test configuration 0017
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0018 b/test/confs/0018
index 7d6437a6d..7856de721 100644
--- a/test/confs/0018
+++ b/test/confs/0018
@@ -1,6 +1,7 @@
 # Exim test configuration 0018
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0019 b/test/confs/0019
index 442ada688..1fd0792a5 100644
--- a/test/confs/0019
+++ b/test/confs/0019
@@ -1,6 +1,7 @@
 # Exim test configuration 2409
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0020 b/test/confs/0020
index c31f5e6d9..9b2924d0a 100644
--- a/test/confs/0020
+++ b/test/confs/0020
@@ -1,6 +1,7 @@
 # Exim test configuration 0020
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0021 b/test/confs/0021
index da9293312..a3513d6c6 100644
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -4,6 +4,7 @@ SERVER=
 BR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0022 b/test/confs/0022
index 5fa25b0aa..c7fb1f304 100644
--- a/test/confs/0022
+++ b/test/confs/0022
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0023 b/test/confs/0023
index 4f79a87b5..2598bdd5f 100644
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -3,6 +3,7 @@
 LOG_SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0024 b/test/confs/0024
index 52a2351bc..741e76858 100644
--- a/test/confs/0024
+++ b/test/confs/0024
@@ -1,6 +1,7 @@
 # Exim test configuration 0024
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0025 b/test/confs/0025
index 658dcb990..2c1d8cf66 100644
--- a/test/confs/0025
+++ b/test/confs/0025
@@ -1,6 +1,7 @@
 # Exim test configuration 0025
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0026 b/test/confs/0026
index 5a0c04e13..198c7a2d9 100644
--- a/test/confs/0026
+++ b/test/confs/0026
@@ -1,6 +1,7 @@
 # Exim test configuration 0026
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0027 b/test/confs/0027
index 8fe398b47..a1f7ee1ca 100644
--- a/test/confs/0027
+++ b/test/confs/0027
@@ -1,6 +1,7 @@
 # Exim test configuration 0027
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0028 b/test/confs/0028
index 6cb607e3d..304e66134 100644
--- a/test/confs/0028
+++ b/test/confs/0028
@@ -1,6 +1,7 @@
 # Exim test configuration 0028
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0029 b/test/confs/0029
index d0c670819..bacf9d835 100644
--- a/test/confs/0029
+++ b/test/confs/0029
@@ -1,6 +1,7 @@
 # Exim test configuration 0029
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0030 b/test/confs/0030
index 553491887..d641a073a 100644
--- a/test/confs/0030
+++ b/test/confs/0030
@@ -1,6 +1,7 @@
 # Exim test configuration 0030
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0031 b/test/confs/0031
index 15cd5415b..66fc59429 100644
--- a/test/confs/0031
+++ b/test/confs/0031
@@ -1,6 +1,7 @@
 # Exim test configuration 0031
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0032 b/test/confs/0032
index fc2f22cd2..3c0f6dd1b 100644
--- a/test/confs/0032
+++ b/test/confs/0032
@@ -1,6 +1,7 @@
 # Exim test configuration 0032
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0033 b/test/confs/0033
index 6b455fa8a..8f0b2011b 100644
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -1,6 +1,7 @@
 # Exim test configuration 0033
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0034 b/test/confs/0034
index 5fbb0b3ba..c8d288f1c 100644
--- a/test/confs/0034
+++ b/test/confs/0034
@@ -1,6 +1,7 @@
 # Exim test configuration 0034
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0035 b/test/confs/0035
index 38b377b67..5dcbe71ba 100644
--- a/test/confs/0035
+++ b/test/confs/0035
@@ -4,6 +4,7 @@ SERVER=
 SUBMISSION_OPTIONS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0036 b/test/confs/0036
index 83997b39b..d94e8c52e 100644
--- a/test/confs/0036
+++ b/test/confs/0036
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0037 b/test/confs/0037
index ad855ec1a..d0754fe2a 100644
--- a/test/confs/0037
+++ b/test/confs/0037
@@ -3,6 +3,7 @@
 FILTER_PREPEND_HOME=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0038 b/test/confs/0038
index e40799455..20df5bfc9 100644
--- a/test/confs/0038
+++ b/test/confs/0038
@@ -5,6 +5,7 @@ DRATELIMIT=0/1h/per_byte/strict
 ACLRCPT=check_rcpt
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0039 b/test/confs/0039
index 3d989414b..1a27dc32a 100644
--- a/test/confs/0039
+++ b/test/confs/0039
@@ -3,6 +3,7 @@
 QDG=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0040 b/test/confs/0040
index 4607d5391..a750d0fe3 100644
--- a/test/confs/0040
+++ b/test/confs/0040
@@ -1,6 +1,7 @@
 # Exim test configuration 0040
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0041 b/test/confs/0041
index fa488e5bb..e6a9f2693 100644
--- a/test/confs/0041
+++ b/test/confs/0041
@@ -1,6 +1,7 @@
 # Exim test configuration 0041
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0042 b/test/confs/0042
index 4d994e4c5..1b8402798 100644
--- a/test/confs/0042
+++ b/test/confs/0042
@@ -1,6 +1,7 @@
 # Exim test configuration 0042
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0043 b/test/confs/0043
index b8d1c9a38..c45e1abdc 100644
--- a/test/confs/0043
+++ b/test/confs/0043
@@ -1,6 +1,7 @@
 # Exim test configuration 0043
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0044 b/test/confs/0044
index ef431f26e..4f23d10a2 100644
--- a/test/confs/0044
+++ b/test/confs/0044
@@ -1,6 +1,7 @@
 # Exim test configuration 0044
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0045 b/test/confs/0045
index d6674dcf7..c3b9a73c0 100644
--- a/test/confs/0045
+++ b/test/confs/0045
@@ -1,6 +1,7 @@
 # Exim test configuration 0045
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0046 b/test/confs/0046
index c70121b32..acf60ebf4 100644
--- a/test/confs/0046
+++ b/test/confs/0046
@@ -3,6 +3,7 @@
 NL=FALSE
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0047 b/test/confs/0047
index 7695652e2..17bd5d136 100644
--- a/test/confs/0047
+++ b/test/confs/0047
@@ -1,6 +1,7 @@
 # Exim test configuration 0047
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0048 b/test/confs/0048
index c0086e441..ae25cf84e 100644
--- a/test/confs/0048
+++ b/test/confs/0048
@@ -3,6 +3,7 @@
 MESSAGE_LOGS = true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0049 b/test/confs/0049
index 7966e0379..cf8966ce6 100644
--- a/test/confs/0049
+++ b/test/confs/0049
@@ -1,6 +1,7 @@
 # Exim test configuration 0049
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0050 b/test/confs/0050
index db87e2918..eea84151e 100644
--- a/test/confs/0050
+++ b/test/confs/0050
@@ -1,6 +1,7 @@
 # Exim test configuration 0050
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0051 b/test/confs/0051
index 018aa9527..764badba5 100644
--- a/test/confs/0051
+++ b/test/confs/0051
@@ -1,6 +1,7 @@
 # Exim test configuration 0051
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0052 b/test/confs/0052
index f483cfe6a..066cda747 100644
--- a/test/confs/0052
+++ b/test/confs/0052
@@ -1,6 +1,7 @@
 # Exim test configuration 0052
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0053 b/test/confs/0053
index 58f6a721b..ba66cdf60 100644
--- a/test/confs/0053
+++ b/test/confs/0053
@@ -1,6 +1,7 @@
 # Exim test configuration 0053
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0054 b/test/confs/0054
index aaddd4963..de8298716 100644
--- a/test/confs/0054
+++ b/test/confs/0054
@@ -1,6 +1,7 @@
 # Exim test configuration 0054
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0055 b/test/confs/0055
index 79b2ac345..a1168f55f 100644
--- a/test/confs/0055
+++ b/test/confs/0055
@@ -1,6 +1,7 @@
 # Exim test configuration 0055
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0056 b/test/confs/0056
index 22375d062..776255a3d 100644
--- a/test/confs/0056
+++ b/test/confs/0056
@@ -1,6 +1,7 @@
 # Exim test configuration 0056
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0057 b/test/confs/0057
index 3dd718359..7f6edfd82 100644
--- a/test/confs/0057
+++ b/test/confs/0057
@@ -1,6 +1,7 @@
 # Exim test configuration 0057
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0058 b/test/confs/0058
index c23b3062b..e351dd33c 100644
--- a/test/confs/0058
+++ b/test/confs/0058
@@ -1,6 +1,7 @@
 # Exim test configuration 0058
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0059 b/test/confs/0059
index 33cf95f52..a6a8528e8 100644
--- a/test/confs/0059
+++ b/test/confs/0059
@@ -1,6 +1,7 @@
 # Exim test configuration 0059
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0060 b/test/confs/0060
index 9561c8ce0..dbc6466b2 100644
--- a/test/confs/0060
+++ b/test/confs/0060
@@ -1,6 +1,7 @@
 # Exim test configuration 0060
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0061 b/test/confs/0061
index b7f9a10c5..f1085e7e5 100644
--- a/test/confs/0061
+++ b/test/confs/0061
@@ -1,6 +1,7 @@
 # Exim test configuration 0061
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = ten-1.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0062 b/test/confs/0062
index e3a11ca3a..22c985eea 100644
--- a/test/confs/0062
+++ b/test/confs/0062
@@ -1,6 +1,7 @@
 # Exim test configuration 0062
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0063 b/test/confs/0063
index 4118128fe..1f9a943e9 100644
--- a/test/confs/0063
+++ b/test/confs/0063
@@ -1,6 +1,7 @@
 # Exim test configuration 0063
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0064 b/test/confs/0064
index e824e6688..7bbaf2b70 100644
--- a/test/confs/0064
+++ b/test/confs/0064
@@ -1,6 +1,7 @@
 # Exim test configuration 0064
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0065 b/test/confs/0065
index 95255805c..0528ec48a 100644
--- a/test/confs/0065
+++ b/test/confs/0065
@@ -1,6 +1,7 @@
 # Exim test configuration 0065
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0066 b/test/confs/0066
index 67da00165..efdd55c7d 100644
--- a/test/confs/0066
+++ b/test/confs/0066
@@ -1,6 +1,7 @@
 # Exim test configuration 0066
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0067 b/test/confs/0067
index 0094578eb..ad74e3fa0 100644
--- a/test/confs/0067
+++ b/test/confs/0067
@@ -1,6 +1,7 @@
 # Exim test configuration 0067
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0068 b/test/confs/0068
index 0300bcacc..c6df1b2d5 100644
--- a/test/confs/0068
+++ b/test/confs/0068
@@ -1,6 +1,7 @@
 # Exim test configuration 0068
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0069 b/test/confs/0069
index 4e1e70d45..49251a16c 100644
--- a/test/confs/0069
+++ b/test/confs/0069
@@ -3,6 +3,7 @@
 LOG_SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0070 b/test/confs/0070
index 77ec017ec..b78db91c1 100644
--- a/test/confs/0070
+++ b/test/confs/0070
@@ -3,6 +3,7 @@
 HVH=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0071 b/test/confs/0071
index e1d76d646..dd996687d 100644
--- a/test/confs/0071
+++ b/test/confs/0071
@@ -1,6 +1,7 @@
 # Exim test configuration 0071
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0072 b/test/confs/0072
index 368db3c51..c4e31e319 100644
--- a/test/confs/0072
+++ b/test/confs/0072
@@ -5,6 +5,7 @@ ONLY=
 RETURN=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0073 b/test/confs/0073
index 8bc9c7c9f..3e2fe17db 100644
--- a/test/confs/0073
+++ b/test/confs/0073
@@ -1,6 +1,7 @@
 # Exim test configuration 0073
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0074 b/test/confs/0074
index 3fc461392..0bc1589e2 100644
--- a/test/confs/0074
+++ b/test/confs/0074
@@ -1,6 +1,7 @@
 # Exim test configuration 0074
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0075 b/test/confs/0075
index 2a171ea2d..9d20236eb 100644
--- a/test/confs/0075
+++ b/test/confs/0075
@@ -1,6 +1,7 @@
 # Exim test configuration 0075
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0076 b/test/confs/0076
index fad78a5ca..6a1fbb5c5 100644
--- a/test/confs/0076
+++ b/test/confs/0076
@@ -1,6 +1,7 @@
 # Exim test configuration 0076
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0077 b/test/confs/0077
index f5df43e10..fb0a0bbcd 100644
--- a/test/confs/0077
+++ b/test/confs/0077
@@ -1,6 +1,7 @@
 # Exim test configuration 0077
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0078 b/test/confs/0078
index 870453d0b..791f6855b 100644
--- a/test/confs/0078
+++ b/test/confs/0078
@@ -1,6 +1,7 @@
 # Exim test configuration 0078
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0079 b/test/confs/0079
index 284f0b0c2..a98f4f01d 100644
--- a/test/confs/0079
+++ b/test/confs/0079
@@ -1,6 +1,7 @@
 # Exim test configuration 0079
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0080 b/test/confs/0080
index 36f94f836..5cb9299fe 100644
--- a/test/confs/0080
+++ b/test/confs/0080
@@ -1,6 +1,7 @@
 # Exim test configuration 0080
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0081 b/test/confs/0081
index 23e22a2a3..7aa53f2c8 100644
--- a/test/confs/0081
+++ b/test/confs/0081
@@ -1,6 +1,7 @@
 # Exim test configuration 0081
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0082 b/test/confs/0082
index 489b9d70d..c3a1846d4 100644
--- a/test/confs/0082
+++ b/test/confs/0082
@@ -1,6 +1,7 @@
 # Exim test configuration 0082
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0083 b/test/confs/0083
index 20a106c6f..ab3791614 100644
--- a/test/confs/0083
+++ b/test/confs/0083
@@ -1,6 +1,7 @@
 # Exim test configuration 0083
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0084 b/test/confs/0084
index 395743c4b..7beede1b3 100644
--- a/test/confs/0084
+++ b/test/confs/0084
@@ -1,6 +1,7 @@
 # Exim test configuration 0084
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0085 b/test/confs/0085
index c2a3ebe75..1879632c6 100644
--- a/test/confs/0085
+++ b/test/confs/0085
@@ -1,6 +1,7 @@
 # Exim test configuration 0085
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0086 b/test/confs/0086
index eb78548e6..e8c67b30a 100644
--- a/test/confs/0086
+++ b/test/confs/0086
@@ -1,6 +1,7 @@
 # Exim test configuration 0086
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0087 b/test/confs/0087
index 4000be1b1..97e340a1a 100644
--- a/test/confs/0087
+++ b/test/confs/0087
@@ -1,6 +1,7 @@
 # Exim test configuration 0087
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0088 b/test/confs/0088
index ac956d35f..91762b60c 100644
--- a/test/confs/0088
+++ b/test/confs/0088
@@ -1,6 +1,7 @@
 # Exim test configuration 0088
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0089 b/test/confs/0089
index f075fdf95..21716dac7 100644
--- a/test/confs/0089
+++ b/test/confs/0089
@@ -1,6 +1,7 @@
 # Exim test configuration 0089
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0090 b/test/confs/0090
index 4cb868f65..65cebbf32 100644
--- a/test/confs/0090
+++ b/test/confs/0090
@@ -1,6 +1,7 @@
 # Exim test configuration 0090
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0091 b/test/confs/0091
index 1c2e05781..cca711d92 100644
--- a/test/confs/0091
+++ b/test/confs/0091
@@ -1,6 +1,7 @@
 # Exim test configuration 0091
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0092 b/test/confs/0092
index c58115939..db9282541 100644
--- a/test/confs/0092
+++ b/test/confs/0092
@@ -8,6 +8,7 @@ domainlist relay_domains = test.ex
 # Exim test configuration 0092
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0093 b/test/confs/0093
index 8d178ff79..2c606ad8e 100644
--- a/test/confs/0093
+++ b/test/confs/0093
@@ -1,6 +1,7 @@
 # Exim test configuration 0093
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0094 b/test/confs/0094
index f03987c34..4f502a087 100644
--- a/test/confs/0094
+++ b/test/confs/0094
@@ -1,6 +1,7 @@
 # Exim test configuration 0094
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0095 b/test/confs/0095
index c9494151d..fe9cfef72 100644
--- a/test/confs/0095
+++ b/test/confs/0095
@@ -4,6 +4,7 @@ ERT=
 QWM=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0096 b/test/confs/0096
index 1ee9b746f..9acd7f8eb 100644
--- a/test/confs/0096
+++ b/test/confs/0096
@@ -1,6 +1,7 @@
 # Exim test configuration 0096
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0097 b/test/confs/0097
index c8e773fc2..38f120e2f 100644
--- a/test/confs/0097
+++ b/test/confs/0097
@@ -1,6 +1,7 @@
 # Exim test configuration 0097
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0098 b/test/confs/0098
index 07346c87e..1ff0a7f77 100644
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -3,6 +3,7 @@
 WMF=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0099 b/test/confs/0099
index ebd6e8915..fb6903bce 100644
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -1,6 +1,7 @@
 # Exim test configuration 0099
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0100 b/test/confs/0100
index 948d807c1..fa2a9a7be 100644
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -1,6 +1,7 @@
 # Exim test configuration 0100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0101 b/test/confs/0101
index 7d88395b9..2b19c28ce 100644
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -1,6 +1,7 @@
 # Exim test configuration 0101
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0102 b/test/confs/0102
index dd17eb840..b2724406a 100644
--- a/test/confs/0102
+++ b/test/confs/0102
@@ -1,6 +1,7 @@
 # Exim test configuration 0102
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0103 b/test/confs/0103
index 7e459b427..14d3bc3c7 100644
--- a/test/confs/0103
+++ b/test/confs/0103
@@ -1,6 +1,7 @@
 # Exim test configuration 0103
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0104 b/test/confs/0104
index cef5303c0..0b964ae40 100644
--- a/test/confs/0104
+++ b/test/confs/0104
@@ -1,6 +1,7 @@
 # Exim test configuration 0104
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0105 b/test/confs/0105
index bdf0eddae..f8e845345 100644
--- a/test/confs/0105
+++ b/test/confs/0105
@@ -1,6 +1,7 @@
 # Exim test configuration 0105
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0106 b/test/confs/0106
index d58ddea98..479036b43 100644
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -1,6 +1,7 @@
 # Exim test configuration 0106
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0107 b/test/confs/0107
index aba16e8d2..616400568 100644
--- a/test/confs/0107
+++ b/test/confs/0107
@@ -1,6 +1,7 @@
 # Exim test configuration 0107
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0108 b/test/confs/0108
index 18ae75895..37f0b73cc 100644
--- a/test/confs/0108
+++ b/test/confs/0108
@@ -1,6 +1,7 @@
 # Exim test configuration 0108
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0109 b/test/confs/0109
index 9f86679d0..87ab9fcd7 100644
--- a/test/confs/0109
+++ b/test/confs/0109
@@ -1,6 +1,7 @@
 # Exim test configuration 094
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0110 b/test/confs/0110
index c6ff8c3ed..2901d31c2 100644
--- a/test/confs/0110
+++ b/test/confs/0110
@@ -1,6 +1,7 @@
 # Exim test configuration 0110
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0111 b/test/confs/0111
index 0af1b33ac..ba547e278 100644
--- a/test/confs/0111
+++ b/test/confs/0111
@@ -1,6 +1,7 @@
 # Exim test configuration 0111
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0112 b/test/confs/0112
index 2598c9277..b480ad36d 100644
--- a/test/confs/0112
+++ b/test/confs/0112
@@ -1,6 +1,7 @@
 # Exim test configuration 0112
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0113 b/test/confs/0113
index c3f63d0ec..29200b28e 100644
--- a/test/confs/0113
+++ b/test/confs/0113
@@ -1,6 +1,7 @@
 # Exim test configuration 0113
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0114 b/test/confs/0114
index 7e4a47cac..a2658026f 100644
--- a/test/confs/0114
+++ b/test/confs/0114
@@ -1,6 +1,7 @@
 # Exim test configuration 0114
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0115 b/test/confs/0115
index 1cf1197f3..37399736d 100644
--- a/test/confs/0115
+++ b/test/confs/0115
@@ -1,6 +1,7 @@
 # Exim test configuration 0115
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0116 b/test/confs/0116
index 42752c357..d3e5292d8 100644
--- a/test/confs/0116
+++ b/test/confs/0116
@@ -1,6 +1,7 @@
 # Exim test configuration 0116
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0117 b/test/confs/0117
index b9d57cf8a..94b040754 100644
--- a/test/confs/0117
+++ b/test/confs/0117
@@ -1,6 +1,7 @@
 # Exim test configuration 0117
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0118 b/test/confs/0118
index f8d42682f..7135487c3 100644
--- a/test/confs/0118
+++ b/test/confs/0118
@@ -1,6 +1,7 @@
 # Exim test configuration 0118
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0119 b/test/confs/0119
index 337920d98..3920341bd 100644
--- a/test/confs/0119
+++ b/test/confs/0119
@@ -1,6 +1,7 @@
 # Exim test configuration 0119
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0120 b/test/confs/0120
index 85c6b883b..51dbefded 100644
--- a/test/confs/0120
+++ b/test/confs/0120
@@ -1,6 +1,7 @@
 # Exim test configuration 0120
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0121 b/test/confs/0121
index 298477092..9d0b5df0e 100644
--- a/test/confs/0121
+++ b/test/confs/0121
@@ -1,6 +1,7 @@
 # Exim test configuration 0121
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0122 b/test/confs/0122
index 44d1a4c02..eff1af6c6 100644
--- a/test/confs/0122
+++ b/test/confs/0122
@@ -1,6 +1,7 @@
 # Exim test configuration 0122
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0123 b/test/confs/0123
index 501af37ad..df2524df6 100644
--- a/test/confs/0123
+++ b/test/confs/0123
@@ -1,6 +1,7 @@
 # Exim test configuration 0123
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0124 b/test/confs/0124
index 33ea902bc..20af62b7f 100644
--- a/test/confs/0124
+++ b/test/confs/0124
@@ -1,6 +1,7 @@
 # Exim test configuration 0124
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0125 b/test/confs/0125
index 3ad7297f2..1ee8b0469 100644
--- a/test/confs/0125
+++ b/test/confs/0125
@@ -1,6 +1,7 @@
 # Exim test configuration 0125
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0126 b/test/confs/0126
index 226ba04f2..c84e9d74b 100644
--- a/test/confs/0126
+++ b/test/confs/0126
@@ -1,6 +1,7 @@
 # Exim test configuration 0126
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0127 b/test/confs/0127
index 9493d33e1..7039bdd2a 100644
--- a/test/confs/0127
+++ b/test/confs/0127
@@ -1,6 +1,7 @@
 # Exim test configuration 0127
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0128 b/test/confs/0128
index 53ecd84b2..c81e94026 100644
--- a/test/confs/0128
+++ b/test/confs/0128
@@ -1,6 +1,7 @@
 # Exim test configuration 0128
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0129 b/test/confs/0129
index 1d6641d92..721ed0f61 100644
--- a/test/confs/0129
+++ b/test/confs/0129
@@ -1,6 +1,7 @@
 # Exim test configuration 0129
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0130 b/test/confs/0130
index 3a81fe2dc..bd832f1cd 100644
--- a/test/confs/0130
+++ b/test/confs/0130
@@ -1,6 +1,7 @@
 # Exim test configuration 0130
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0131 b/test/confs/0131
index 460056972..54bd6b52c 100644
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -1,6 +1,7 @@
 # Exim test configuration 0131
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0132 b/test/confs/0132
index 3b4239216..e0918d77c 100644
--- a/test/confs/0132
+++ b/test/confs/0132
@@ -1,6 +1,7 @@
 # Exim test configuration 0132
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0133 b/test/confs/0133
index 11b2ab3d9..ba797df70 100644
--- a/test/confs/0133
+++ b/test/confs/0133
@@ -1,6 +1,7 @@
 # Exim test configuration 0133
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0134 b/test/confs/0134
index 607c7613c..a7f3d14a2 100644
--- a/test/confs/0134
+++ b/test/confs/0134
@@ -1,6 +1,7 @@
 # Exim test configuration 0134
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0135 b/test/confs/0135
index 233d48b4c..6b176aa04 100644
--- a/test/confs/0135
+++ b/test/confs/0135
@@ -1,6 +1,7 @@
 # Exim test configuration 0135
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0136 b/test/confs/0136
index 7e0cfdad3..6754a5b7f 100644
--- a/test/confs/0136
+++ b/test/confs/0136
@@ -3,6 +3,7 @@
 BRB=true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0137 b/test/confs/0137
index b69bf640b..1cf1f852a 100644
--- a/test/confs/0137
+++ b/test/confs/0137
@@ -1,6 +1,7 @@
 # Exim test configuration 0137
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0138 b/test/confs/0138
index 521dcd759..dc601f419 100644
--- a/test/confs/0138
+++ b/test/confs/0138
@@ -1,6 +1,7 @@
 # Exim test configuration 0138
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0139 b/test/confs/0139
index 5327de987..1b7648f2b 100644
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -1,6 +1,7 @@
 # Exim test configuration 0139
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0140 b/test/confs/0140
index b228ba5dc..addd28b6d 100644
--- a/test/confs/0140
+++ b/test/confs/0140
@@ -1,6 +1,7 @@
 # Exim test configuration 0140
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0141 b/test/confs/0141
index 7ae9a7029..1bea9ea9e 100644
--- a/test/confs/0141
+++ b/test/confs/0141
@@ -1,6 +1,7 @@
 # Exim test configuration 0141
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0142 b/test/confs/0142
index 1736e9a1b..2c49219fd 100644
--- a/test/confs/0142
+++ b/test/confs/0142
@@ -1,6 +1,7 @@
 # Exim test configuration 0142
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0143 b/test/confs/0143
index ad18789c9..c171227ba 100644
--- a/test/confs/0143
+++ b/test/confs/0143
@@ -1,6 +1,7 @@
 # Exim test configuration 0143
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0144 b/test/confs/0144
index a0b6860a9..f4e1d7f28 100644
--- a/test/confs/0144
+++ b/test/confs/0144
@@ -1,6 +1,7 @@
 # Exim test configuration 0144
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0145 b/test/confs/0145
index ed7b7bf86..a635e5f1a 100644
--- a/test/confs/0145
+++ b/test/confs/0145
@@ -1,6 +1,7 @@
 # Exim test configuration 0145
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0146 b/test/confs/0146
index 34235d101..d726072eb 100644
--- a/test/confs/0146
+++ b/test/confs/0146
@@ -1,6 +1,7 @@
 # Exim test configuration 0146
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0147 b/test/confs/0147
index 5243b7ae3..6aa3cf243 100644
--- a/test/confs/0147
+++ b/test/confs/0147
@@ -7,6 +7,7 @@ ABCD_XYZ = abcdxyz
 ABCD=abcd + ABCD_XYZ
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0148 b/test/confs/0148
index d2cf6d1eb..95c9678e3 100644
--- a/test/confs/0148
+++ b/test/confs/0148
@@ -1,6 +1,7 @@
 # Exim test configuration 0148
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0149 b/test/confs/0149
index f200efdb2..d9b68d927 100644
--- a/test/confs/0149
+++ b/test/confs/0149
@@ -1,6 +1,7 @@
 # Exim test configuration 0149
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0150 b/test/confs/0150
index 455d676ba..33a4e3d58 100644
--- a/test/confs/0150
+++ b/test/confs/0150
@@ -1,6 +1,7 @@
 # Exim test configuration 0150
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0151 b/test/confs/0151
index db4e56ddb..1b8c2a28b 100644
--- a/test/confs/0151
+++ b/test/confs/0151
@@ -1,6 +1,7 @@
 # Exim test configuration 0151
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0152 b/test/confs/0152
index 0cd248785..d3a669be7 100644
--- a/test/confs/0152
+++ b/test/confs/0152
@@ -1,6 +1,7 @@
 # Exim test configuration 0152
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0153 b/test/confs/0153
index b604f9b94..8577340e9 100644
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -1,6 +1,7 @@
 # Exim test configuration 0153
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0154 b/test/confs/0154
index c19c5842c..12d523f7e 100644
--- a/test/confs/0154
+++ b/test/confs/0154
@@ -1,6 +1,7 @@
 # Exim test configuration 0154
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0155 b/test/confs/0155
index 3e112458a..55d3b4a98 100644
--- a/test/confs/0155
+++ b/test/confs/0155
@@ -1,6 +1,7 @@
 # Exim test configuration 0155
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0156 b/test/confs/0156
index f24a064db..3c331cffe 100644
--- a/test/confs/0156
+++ b/test/confs/0156
@@ -1,6 +1,7 @@
 # Exim test configuration 0156
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0157 b/test/confs/0157
index 05dc9eea9..41e9fea85 100644
--- a/test/confs/0157
+++ b/test/confs/0157
@@ -1,6 +1,7 @@
 # Exim test configuration 0157
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0158 b/test/confs/0158
index c59767db5..bdb3a07af 100644
--- a/test/confs/0158
+++ b/test/confs/0158
@@ -1,6 +1,7 @@
 # Exim test configuration 0158
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0159 b/test/confs/0159
index c4f3dc5f9..acc21ac1d 100644
--- a/test/confs/0159
+++ b/test/confs/0159
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0160 b/test/confs/0160
index 48d493c76..8f5a85e1d 100644
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -1,6 +1,7 @@
 # Exim test configuration 0160
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0161 b/test/confs/0161
index deb67e5b3..8843d3a7b 100644
--- a/test/confs/0161
+++ b/test/confs/0161
@@ -1,6 +1,7 @@
 # Exim test configuration 0161
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0162 b/test/confs/0162
index c89878959..0f99b64b9 100644
--- a/test/confs/0162
+++ b/test/confs/0162
@@ -1,6 +1,7 @@
 # Exim test configuration 0162
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0163 b/test/confs/0163
index 16d5292f3..eddb5195f 100644
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -1,6 +1,7 @@
 # Exim test configuration 0163
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0164 b/test/confs/0164
index bcc34bb05..a221e992a 100644
--- a/test/confs/0164
+++ b/test/confs/0164
@@ -1,6 +1,7 @@
 # Exim test configuration 0164
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0165 b/test/confs/0165
index 050b75f66..66fb1da86 100644
--- a/test/confs/0165
+++ b/test/confs/0165
@@ -1,6 +1,7 @@
 # Exim test configuration 0165
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0166 b/test/confs/0166
index b94331b44..f2d033404 100644
--- a/test/confs/0166
+++ b/test/confs/0166
@@ -1,6 +1,7 @@
 # Exim test configuration 0166
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0167 b/test/confs/0167
index 1e88e6d43..05ea86d9d 100644
--- a/test/confs/0167
+++ b/test/confs/0167
@@ -1,6 +1,7 @@
 # Exim test configuration 0167
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0168 b/test/confs/0168
index 8a6d133f6..1dfc866ca 100644
--- a/test/confs/0168
+++ b/test/confs/0168
@@ -1,6 +1,7 @@
 # Exim test configuration 0168
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0169 b/test/confs/0169
index a09a3f538..f5fd6ac36 100644
--- a/test/confs/0169
+++ b/test/confs/0169
@@ -1,6 +1,7 @@
 # Exim test configuration 0169
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0170 b/test/confs/0170
index 87c9cceda..e7265d372 100644
--- a/test/confs/0170
+++ b/test/confs/0170
@@ -1,6 +1,7 @@
 # Exim test configuration 0170
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0171 b/test/confs/0171
index 70a4f0702..6ceac5fda 100644
--- a/test/confs/0171
+++ b/test/confs/0171
@@ -1,6 +1,7 @@
 # Exim test configuration 74
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0172 b/test/confs/0172
index 1772e9008..277648566 100644
--- a/test/confs/0172
+++ b/test/confs/0172
@@ -1,6 +1,7 @@
 # Exim test configuration 0172
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0173 b/test/confs/0173
index 07763aa56..957c23162 100644
--- a/test/confs/0173
+++ b/test/confs/0173
@@ -1,6 +1,7 @@
 # Exim test configuration 0173
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0174 b/test/confs/0174
index 012408e99..f770e2fad 100644
--- a/test/confs/0174
+++ b/test/confs/0174
@@ -1,6 +1,7 @@
 # Exim test configuration 0174
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0175 b/test/confs/0175
index 7fba5b6ab..b6be9c213 100644
--- a/test/confs/0175
+++ b/test/confs/0175
@@ -1,6 +1,7 @@
 # Exim test configuration 0175
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0176 b/test/confs/0176
index 725973b67..35c8987a1 100644
--- a/test/confs/0176
+++ b/test/confs/0176
@@ -1,6 +1,7 @@
 # Exim test configuration 0176
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0177 b/test/confs/0177
index 273d0a7c2..4157d2e53 100644
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -1,6 +1,7 @@
 # Exim test configuration 0177
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0178 b/test/confs/0178
index f13ae20da..e96c4ad34 100644
--- a/test/confs/0178
+++ b/test/confs/0178
@@ -1,6 +1,7 @@
 # Exim test configuration 0178
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0179 b/test/confs/0179
index 0aee0c056..e57a45e64 100644
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -1,6 +1,7 @@
 # Exim test configuration 0179
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0180 b/test/confs/0180
index 7f9d824f8..5329b84f0 100644
--- a/test/confs/0180
+++ b/test/confs/0180
@@ -3,6 +3,7 @@
 CSS=check_spool_space=100000000K
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0181 b/test/confs/0181
index d4e1227e5..8e5cd9482 100644
--- a/test/confs/0181
+++ b/test/confs/0181
@@ -1,6 +1,7 @@
 # Exim test configuration 0181
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0182 b/test/confs/0182
index 6125ed268..f7be6d43a 100644
--- a/test/confs/0182
+++ b/test/confs/0182
@@ -1,6 +1,7 @@
 # Exim test configuration 0182
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0183 b/test/confs/0183
index 73478f438..d3340f9d5 100644
--- a/test/confs/0183
+++ b/test/confs/0183
@@ -1,6 +1,7 @@
 # Exim test configuration 0183
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0184 b/test/confs/0184
index 7b8cc0d0f..c4ce1e8eb 100644
--- a/test/confs/0184
+++ b/test/confs/0184
@@ -1,6 +1,7 @@
 # Exim test configuration 0184
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0185 b/test/confs/0185
index 08cb1d2c7..3a53881df 100644
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -1,6 +1,7 @@
 # Exim test configuration 0185
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0186 b/test/confs/0186
index 931319f94..aa8d6fed3 100644
--- a/test/confs/0186
+++ b/test/confs/0186
@@ -1,6 +1,7 @@
 # Exim test configuration 0186
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0187 b/test/confs/0187
index e93e4b464..bea279f6f 100644
--- a/test/confs/0187
+++ b/test/confs/0187
@@ -1,6 +1,7 @@
 # Exim test configuration 0187
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0188 b/test/confs/0188
index 60b8b3071..bd3b701f9 100644
--- a/test/confs/0188
+++ b/test/confs/0188
@@ -1,6 +1,7 @@
 # Exim test configuration 0188
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0189 b/test/confs/0189
index 98bb2365b..db2467bd6 100644
--- a/test/confs/0189
+++ b/test/confs/0189
@@ -1,6 +1,7 @@
 # Exim test configuration 0189
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0190 b/test/confs/0190
index 3b34b0cad..8adca0e92 100644
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -1,6 +1,7 @@
 # Exim test configuration 0190
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0191 b/test/confs/0191
index 1cbe7eb2c..bfa0abbfe 100644
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -1,6 +1,7 @@
 # Exim test configuration 0191
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0192 b/test/confs/0192
index d67e0bda4..6a0cb5670 100644
--- a/test/confs/0192
+++ b/test/confs/0192
@@ -1,6 +1,7 @@
 # Exim test configuration 0192
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0193 b/test/confs/0193
index 9410a4d4d..a9229d160 100644
--- a/test/confs/0193
+++ b/test/confs/0193
@@ -1,6 +1,7 @@
 # Exim test configuration 0193
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0194 b/test/confs/0194
index bfcaa5060..d524a7f01 100644
--- a/test/confs/0194
+++ b/test/confs/0194
@@ -1,6 +1,7 @@
 # Exim test configuration 0194
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0195 b/test/confs/0195
index 19efd4e41..13e8d0aa7 100644
--- a/test/confs/0195
+++ b/test/confs/0195
@@ -1,6 +1,7 @@
 # Exim test configuration 0195
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0196 b/test/confs/0196
index 214f5292b..31c9e1779 100644
--- a/test/confs/0196
+++ b/test/confs/0196
@@ -1,6 +1,7 @@
 # Exim test configuration 0196
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0197 b/test/confs/0197
index 175b671cb..85389cc18 100644
--- a/test/confs/0197
+++ b/test/confs/0197
@@ -4,6 +4,7 @@
 # and these settings.
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0198 b/test/confs/0198
index ab05bf195..37862f7a6 100644
--- a/test/confs/0198
+++ b/test/confs/0198
@@ -1,6 +1,7 @@
 # Exim test configuration 0198
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0199 b/test/confs/0199
index 8c84ee689..2a8ef3e68 100644
--- a/test/confs/0199
+++ b/test/confs/0199
@@ -1,6 +1,7 @@
 # Exim test configuration 0199
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0200 b/test/confs/0200
index 107b63431..02764dbc8 100644
--- a/test/confs/0200
+++ b/test/confs/0200
@@ -1,6 +1,7 @@
 # Exim test configuration 0200
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0201 b/test/confs/0201
index 284e3848b..56c0aed82 100644
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -1,6 +1,7 @@
 # Exim test configuration 0201
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0202 b/test/confs/0202
index da3660c27..13d7a55fc 100644
--- a/test/confs/0202
+++ b/test/confs/0202
@@ -1,6 +1,7 @@
 # Exim test configuration 0202
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0203 b/test/confs/0203
index f1080e060..c9d25ba1e 100644
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -1,6 +1,7 @@
 # Exim test configuration 0203
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0204 b/test/confs/0204
index e7db49f7b..e24610077 100644
--- a/test/confs/0204
+++ b/test/confs/0204
@@ -1,6 +1,7 @@
 # Exim test configuration 0204
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0205 b/test/confs/0205
index 42638bcd5..8426b9983 100644
--- a/test/confs/0205
+++ b/test/confs/0205
@@ -1,6 +1,7 @@
 # Exim test configuration 0205
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0206 b/test/confs/0206
index ca3b96eb7..ce8a1fcce 100644
--- a/test/confs/0206
+++ b/test/confs/0206
@@ -1,6 +1,7 @@
 # Exim test configuration 0206
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0207 b/test/confs/0207
index f119bce27..9fc9ae476 100644
--- a/test/confs/0207
+++ b/test/confs/0207
@@ -1,6 +1,7 @@
 # Exim test configuration 0207
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0208 b/test/confs/0208
index a80fb6de5..a6cad8bac 100644
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -3,6 +3,7 @@
 MESSAGE_LOGS = true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0209 b/test/confs/0209
index b9db7a0cc..5111b5a79 100644
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -1,6 +1,7 @@
 # Exim test configuration 0209
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0210 b/test/confs/0210
index 486f1ae3d..a4724cd5b 100644
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -1,6 +1,7 @@
 # Exim test configuration 0210
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0211 b/test/confs/0211
index 389437340..f5a29d0ad 100644
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -1,6 +1,7 @@
 # Exim test configuration 0211
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0212 b/test/confs/0212
index 3c0f49d25..96c9b3076 100644
--- a/test/confs/0212
+++ b/test/confs/0212
@@ -1,6 +1,7 @@
 # Exim test configuration 0212
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0213 b/test/confs/0213
index 16a8a33a8..4032d529c 100644
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -1,6 +1,7 @@
 # Exim test configuration 0213
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0214 b/test/confs/0214
index 2c9e03893..e73bc1edc 100644
--- a/test/confs/0214
+++ b/test/confs/0214
@@ -1,6 +1,7 @@
 # Exim test configuration 215
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0215 b/test/confs/0215
index 102fd0ada..eaaca7900 100644
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -5,6 +5,7 @@ AUTHS=
 AUTHF=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0216 b/test/confs/0216
index 04195d153..352207e59 100644
--- a/test/confs/0216
+++ b/test/confs/0216
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0217 b/test/confs/0217
index 32c46e232..9fab5da06 100644
--- a/test/confs/0217
+++ b/test/confs/0217
@@ -3,6 +3,7 @@
 HAP=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0218 b/test/confs/0218
index 4458e1846..cefe1b7a4 100644
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -1,6 +1,7 @@
 # Exim test configuration 0218
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0219 b/test/confs/0219
index b221a88c8..6fa0f558e 100644
--- a/test/confs/0219
+++ b/test/confs/0219
@@ -1,6 +1,7 @@
 # Exim test configuration 0219
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0220 b/test/confs/0220
index ea7f2f58f..ed1cd6bd3 100644
--- a/test/confs/0220
+++ b/test/confs/0220
@@ -1,6 +1,7 @@
 # Exim test configuration 0220
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0221 b/test/confs/0221
index a05aaae5e..a1f7cbe34 100644
--- a/test/confs/0221
+++ b/test/confs/0221
@@ -1,6 +1,7 @@
 # Exim test configuration 0221
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0222 b/test/confs/0222
index f6f720ec7..c61f5fa73 100644
--- a/test/confs/0222
+++ b/test/confs/0222
@@ -1,6 +1,7 @@
 # Exim test configuration 0222
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0223 b/test/confs/0223
index af375c990..da2eb3fd8 100644
--- a/test/confs/0223
+++ b/test/confs/0223
@@ -1,6 +1,7 @@
 # Exim test configuration 0223
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0224 b/test/confs/0224
index 9ce4bc492..4b9c351e7 100644
--- a/test/confs/0224
+++ b/test/confs/0224
@@ -1,6 +1,7 @@
 # Exim test configuration 0224
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0225 b/test/confs/0225
index f10ea4b71..1d34f3815 100644
--- a/test/confs/0225
+++ b/test/confs/0225
@@ -1,6 +1,7 @@
 # Exim test configuration 0225
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0226 b/test/confs/0226
index 8b6a67e45..6b0950621 100644
--- a/test/confs/0226
+++ b/test/confs/0226
@@ -1,6 +1,7 @@
 # Exim test configuration 0226
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0227 b/test/confs/0227
index 06fae3f56..eb1fb1301 100644
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -1,6 +1,7 @@
 # Exim test configuration 0227
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0228 b/test/confs/0228
index dbf4d1299..46817327d 100644
--- a/test/confs/0228
+++ b/test/confs/0228
@@ -1,6 +1,7 @@
 # Exim test configuration 0228
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0229 b/test/confs/0229
index af78f1c5c..9522bb2f7 100644
--- a/test/confs/0229
+++ b/test/confs/0229
@@ -1,6 +1,7 @@
 # Exim test configuration 0229
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0230 b/test/confs/0230
index 82c0c0432..967bbc540 100644
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0231 b/test/confs/0231
index 721b8f7e5..8b85a44c1 100644
--- a/test/confs/0231
+++ b/test/confs/0231
@@ -1,6 +1,7 @@
 # Exim test configuration 0231
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0232 b/test/confs/0232
index 99edc2876..45e569782 100644
--- a/test/confs/0232
+++ b/test/confs/0232
@@ -1,6 +1,7 @@
 # Exim test configuration 0232
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0233 b/test/confs/0233
index 15c605c24..855f73c0c 100644
--- a/test/confs/0233
+++ b/test/confs/0233
@@ -1,6 +1,7 @@
 # Exim test configuration 0233
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0234 b/test/confs/0234
index 69c8163ee..7106911fd 100644
--- a/test/confs/0234
+++ b/test/confs/0234
@@ -1,6 +1,7 @@
 # Exim test configuration 0234
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0235 b/test/confs/0235
index 4856e72a2..108d46969 100644
--- a/test/confs/0235
+++ b/test/confs/0235
@@ -1,6 +1,7 @@
 # Exim test configuration 0235
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0236 b/test/confs/0236
index e2402a5f8..711da37e4 100644
--- a/test/confs/0236
+++ b/test/confs/0236
@@ -1,6 +1,7 @@
 # Exim test configuration 0236
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0237 b/test/confs/0237
index ff0fb76c2..f4aab083f 100644
--- a/test/confs/0237
+++ b/test/confs/0237
@@ -1,6 +1,7 @@
 # Exim test configuration 0237
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0238 b/test/confs/0238
index 6ff214e93..14e3325c7 100644
--- a/test/confs/0238
+++ b/test/confs/0238
@@ -1,6 +1,7 @@
 # Exim test configuration 0238
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0239 b/test/confs/0239
index 8712fb909..10d10a6f2 100644
--- a/test/confs/0239
+++ b/test/confs/0239
@@ -1,6 +1,7 @@
 # Exim test configuration 0239
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0240 b/test/confs/0240
index 91fcc9e1e..c9716a788 100644
--- a/test/confs/0240
+++ b/test/confs/0240
@@ -1,6 +1,7 @@
 # Exim test configuration 0240
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0241 b/test/confs/0241
index 03d55b135..5822b8aef 100644
--- a/test/confs/0241
+++ b/test/confs/0241
@@ -1,6 +1,7 @@
 # Exim test configuration 0241
 
 exim_path = EXIM_PATH/junk
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0242 b/test/confs/0242
index 0acf78fca..3aeb1e3dd 100644
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -1,6 +1,7 @@
 # Exim test configuration 0242
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0243 b/test/confs/0243
index b703f3466..5e3cc3dc4 100644
--- a/test/confs/0243
+++ b/test/confs/0243
@@ -1,6 +1,7 @@
 # Exim test configuration 0243
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0244 b/test/confs/0244
index f9fb3b525..feaa314fc 100644
--- a/test/confs/0244
+++ b/test/confs/0244
@@ -1,6 +1,7 @@
 # Exim test configuration 0244
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0245 b/test/confs/0245
index b5a55d4c6..80d29467f 100644
--- a/test/confs/0245
+++ b/test/confs/0245
@@ -1,6 +1,7 @@
 # Exim test configuration 0245
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0246 b/test/confs/0246
index 57d807825..36a8e8baf 100644
--- a/test/confs/0246
+++ b/test/confs/0246
@@ -1,6 +1,7 @@
 # Exim test configuration 0246
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0247 b/test/confs/0247
index eb11b0939..00f21a33a 100644
--- a/test/confs/0247
+++ b/test/confs/0247
@@ -1,6 +1,7 @@
 # Exim test configuration 0247
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0248 b/test/confs/0248
index dc34e53e6..29a7bce8a 100644
--- a/test/confs/0248
+++ b/test/confs/0248
@@ -1,6 +1,7 @@
 # Exim test configuration 0248
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0249 b/test/confs/0249
index afeb2f739..6a7c5da52 100644
--- a/test/confs/0249
+++ b/test/confs/0249
@@ -1,6 +1,7 @@
 # Exim test configuration 0249
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0250 b/test/confs/0250
index 06ea63643..370a38bf4 100644
--- a/test/confs/0250
+++ b/test/confs/0250
@@ -1,6 +1,7 @@
 # Exim test configuration 0250
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0251 b/test/confs/0251
index 69f04c08b..7936f31ee 100644
--- a/test/confs/0251
+++ b/test/confs/0251
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0252 b/test/confs/0252
index 444aa100f..e515d1606 100644
--- a/test/confs/0252
+++ b/test/confs/0252
@@ -1,6 +1,7 @@
 # Exim test configuration 0252
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0253 b/test/confs/0253
index b72de8cd2..faebfaac2 100644
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -1,6 +1,7 @@
 # Exim test configuration 0253
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0254 b/test/confs/0254
index 8fdf9f581..a2bd44ba4 100644
--- a/test/confs/0254
+++ b/test/confs/0254
@@ -1,6 +1,7 @@
 # Exim test configuration 0254
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0255 b/test/confs/0255
index 0de9863d5..d372e0e14 100644
--- a/test/confs/0255
+++ b/test/confs/0255
@@ -3,6 +3,7 @@
 OPTION=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0256 b/test/confs/0256
index d17ee8d9f..fcf138d1a 100644
--- a/test/confs/0256
+++ b/test/confs/0256
@@ -1,6 +1,7 @@
 # Exim test configuration 0256
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0257 b/test/confs/0257
index e0bef95a6..c26ba2b2a 100644
--- a/test/confs/0257
+++ b/test/confs/0257
@@ -1,6 +1,7 @@
 # Exim test configuration 0257
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0258 b/test/confs/0258
index a507987f3..e2c908dcb 100644
--- a/test/confs/0258
+++ b/test/confs/0258
@@ -1,6 +1,7 @@
 # Exim test configuration 0258
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0259 b/test/confs/0259
index cd5c30362..90adc0764 100644
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -1,6 +1,7 @@
 # Exim test configuration 0259
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0260 b/test/confs/0260
index 40df0612c..1b29b857c 100644
--- a/test/confs/0260
+++ b/test/confs/0260
@@ -1,6 +1,7 @@
 # Exim test configuration 0260
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0261 b/test/confs/0261
index 62f161f0e..0b0b77313 100644
--- a/test/confs/0261
+++ b/test/confs/0261
@@ -1,6 +1,7 @@
 # Exim test configuration 0261
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0262 b/test/confs/0262
index b884f80d4..704e0c906 100644
--- a/test/confs/0262
+++ b/test/confs/0262
@@ -1,6 +1,7 @@
 # Exim test configuration 0262
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0263 b/test/confs/0263
index bbc69923e..7ad3e0e36 100644
--- a/test/confs/0263
+++ b/test/confs/0263
@@ -1,6 +1,7 @@
 # Exim test configuration 0263
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0264 b/test/confs/0264
index be718bcc9..2fd00ca28 100644
--- a/test/confs/0264
+++ b/test/confs/0264
@@ -1,6 +1,7 @@
 # Exim test configuration 0264
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0265 b/test/confs/0265
index 5070e20fc..63e684407 100644
--- a/test/confs/0265
+++ b/test/confs/0265
@@ -1,6 +1,7 @@
 # Exim test configuration 0265
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0266 b/test/confs/0266
index 534abaea8..a0b6b1185 100644
--- a/test/confs/0266
+++ b/test/confs/0266
@@ -1,6 +1,7 @@
 # Exim test configuration 0266
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0267 b/test/confs/0267
index b755a33ca..f7c9e65d9 100644
--- a/test/confs/0267
+++ b/test/confs/0267
@@ -1,6 +1,7 @@
 # Exim test configuration 0267
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0268 b/test/confs/0268
index 6be4e662f..ca336039a 100644
--- a/test/confs/0268
+++ b/test/confs/0268
@@ -1,6 +1,7 @@
 # Exim test configuration 0268
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0269 b/test/confs/0269
index 5c992194c..133157e95 100644
--- a/test/confs/0269
+++ b/test/confs/0269
@@ -1,6 +1,7 @@
 # Exim test configuration 0269
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0270 b/test/confs/0270
index f05958861..af25831ad 100644
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -1,6 +1,7 @@
 # Exim test configuration 0270
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0271 b/test/confs/0271
index f3fb43846..04624fb6a 100644
--- a/test/confs/0271
+++ b/test/confs/0271
@@ -1,6 +1,7 @@
 # Exim test configuration 0271
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0272 b/test/confs/0272
index 94955d8e9..0dfd48ebd 100644
--- a/test/confs/0272
+++ b/test/confs/0272
@@ -1,6 +1,7 @@
 # Exim test configuration 0272
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0273 b/test/confs/0273
index 48bd71909..a62098df8 100644
--- a/test/confs/0273
+++ b/test/confs/0273
@@ -1,6 +1,7 @@
 # Exim test configuration 0273
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0274 b/test/confs/0274
index 72005a6c4..dac6c1c89 100644
--- a/test/confs/0274
+++ b/test/confs/0274
@@ -1,6 +1,7 @@
 # Exim test configuration 0274
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0275 b/test/confs/0275
index b96c65bb9..75bd9e950 100644
--- a/test/confs/0275
+++ b/test/confs/0275
@@ -1,6 +1,7 @@
 # Exim test configuration 0275
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0276 b/test/confs/0276
index 96ce20957..ad14b6468 100644
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -1,6 +1,7 @@
 # Exim test configuration 0276
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0277 b/test/confs/0277
index 245936a94..706cd8622 100644
--- a/test/confs/0277
+++ b/test/confs/0277
@@ -1,6 +1,7 @@
 # Exim test configuration 0277
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0278 b/test/confs/0278
index 6333840e4..9b6700b62 100644
--- a/test/confs/0278
+++ b/test/confs/0278
@@ -1,6 +1,7 @@
 # Exim test configuration 0278
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0279 b/test/confs/0279
index 1b8306496..e17c63be3 100644
--- a/test/confs/0279
+++ b/test/confs/0279
@@ -1,6 +1,7 @@
 # Exim test configuration 0279
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0280 b/test/confs/0280
index 17134c371..ccbaf507e 100644
--- a/test/confs/0280
+++ b/test/confs/0280
@@ -1,6 +1,7 @@
 # Exim test configuration 0280
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0281 b/test/confs/0281
index 002bb1654..2a9cfde3e 100644
--- a/test/confs/0281
+++ b/test/confs/0281
@@ -1,6 +1,7 @@
 # Exim test configuration 0281
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0282 b/test/confs/0282
index 9ebe5ad81..6b0c37282 100644
--- a/test/confs/0282
+++ b/test/confs/0282
@@ -1,6 +1,7 @@
 # Exim test configuration 0282
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0283 b/test/confs/0283
index 760109c3c..6743ddedb 100644
--- a/test/confs/0283
+++ b/test/confs/0283
@@ -1,6 +1,7 @@
 # Exim test configuration 0283
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0284 b/test/confs/0284
index 0ec0b0f93..9ac69866d 100644
--- a/test/confs/0284
+++ b/test/confs/0284
@@ -1,6 +1,7 @@
 # Exim test configuration 0284
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0285 b/test/confs/0285
index f58324817..793d60f7a 100644
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -1,6 +1,7 @@
 # Exim test configuration 0285
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0286 b/test/confs/0286
index b7746b5e7..cca68010c 100644
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -1,6 +1,7 @@
 # Exim test configuration 0286
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0287 b/test/confs/0287
index a355a8b36..d82cab0b0 100644
--- a/test/confs/0287
+++ b/test/confs/0287
@@ -1,6 +1,7 @@
 # Exim test configuration 0287
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0288 b/test/confs/0288
index 938e08ed5..fa629b48b 100644
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -1,6 +1,7 @@
 # Exim test configuration 0288
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0289 b/test/confs/0289
index 8e526084b..430b0d0ee 100644
--- a/test/confs/0289
+++ b/test/confs/0289
@@ -1,6 +1,7 @@
 # Exim test configuration 0289
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0290 b/test/confs/0290
index 929a90740..773152135 100644
--- a/test/confs/0290
+++ b/test/confs/0290
@@ -11,6 +11,7 @@ C2=#
 C1C2 this should be a comment
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0291 b/test/confs/0291
index e7506373c..e4634f678 100644
--- a/test/confs/0291
+++ b/test/confs/0291
@@ -1,6 +1,7 @@
 # Exim test configuration 0291
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0292 b/test/confs/0292
index 1dd0769d0..54c14f494 100644
--- a/test/confs/0292
+++ b/test/confs/0292
@@ -1,6 +1,7 @@
 # Exim test configuration 0292
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0293 b/test/confs/0293
index 3a402d410..ce12858f6 100644
--- a/test/confs/0293
+++ b/test/confs/0293
@@ -1,6 +1,7 @@
 # Exim test configuration 0293
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0294 b/test/confs/0294
index f4b9e73be..b75566ffd 100644
--- a/test/confs/0294
+++ b/test/confs/0294
@@ -1,6 +1,7 @@
 # Exim test configuration 0294
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0295 b/test/confs/0295
index cd85c4525..10dfffc47 100644
--- a/test/confs/0295
+++ b/test/confs/0295
@@ -1,6 +1,7 @@
 # Exim test configuration 0295
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0296 b/test/confs/0296
index 194f4043c..3a7b5874b 100644
--- a/test/confs/0296
+++ b/test/confs/0296
@@ -1,6 +1,7 @@
 # Exim test configuration 0296
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0297 b/test/confs/0297
index 8f6b6d5c6..5ded3cbbe 100644
--- a/test/confs/0297
+++ b/test/confs/0297
@@ -1,6 +1,7 @@
 # Exim test configuration 0297
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0298 b/test/confs/0298
index 13c277985..295aff266 100644
--- a/test/confs/0298
+++ b/test/confs/0298
@@ -1,6 +1,7 @@
 # Exim test configuration 0298
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0299 b/test/confs/0299
index 0dc862f0a..2434270dc 100644
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -1,6 +1,7 @@
 # Exim test configuration 347
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0300 b/test/confs/0300
index c22dd5d03..cba81e028 100644
--- a/test/confs/0300
+++ b/test/confs/0300
@@ -4,6 +4,7 @@ DELAY=0s
 PAH=127.0.0.1
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0301 b/test/confs/0301
index 381324372..bbb6aaad1 100644
--- a/test/confs/0301
+++ b/test/confs/0301
@@ -1,6 +1,7 @@
 # Exim test configuration 0301
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0302 b/test/confs/0302
index 1261815ad..6f60a0a20 100644
--- a/test/confs/0302
+++ b/test/confs/0302
@@ -1,6 +1,7 @@
 # Exim test configuration 0302
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0303 b/test/confs/0303
index b5ffa4573..82b93d8fa 100644
--- a/test/confs/0303
+++ b/test/confs/0303
@@ -1,6 +1,7 @@
 # Exim test configuration 0303
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0304 b/test/confs/0304
index d31627f24..b99b6d254 100644
--- a/test/confs/0304
+++ b/test/confs/0304
@@ -1,6 +1,7 @@
 # Exim test configuration 0304
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0305 b/test/confs/0305
index 7283f14a5..453610eb2 100644
--- a/test/confs/0305
+++ b/test/confs/0305
@@ -1,6 +1,7 @@
 # Exim test configuration 0305
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0306 b/test/confs/0306
index 85117e017..8b8107306 100644
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -1,6 +1,7 @@
 # Exim test configuration 0306
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0307 b/test/confs/0307
index 901ed1d85..b87392eef 100644
--- a/test/confs/0307
+++ b/test/confs/0307
@@ -1,6 +1,7 @@
 # Exim test configuration 356
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0308 b/test/confs/0308
index cab9279e7..96704af06 100644
--- a/test/confs/0308
+++ b/test/confs/0308
@@ -1,6 +1,7 @@
 # Exim test configuration 0308
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0309 b/test/confs/0309
index f8ed89e55..5e52b31d0 100644
--- a/test/confs/0309
+++ b/test/confs/0309
@@ -1,6 +1,7 @@
 # Exim test configuration 0309
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0310 b/test/confs/0310
index 74ba773ae..68ffd385d 100644
--- a/test/confs/0310
+++ b/test/confs/0310
@@ -1,6 +1,7 @@
 # Exim test configuration 0310
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0311 b/test/confs/0311
index 34a99b6c5..9bbe51f3d 100644
--- a/test/confs/0311
+++ b/test/confs/0311
@@ -1,6 +1,7 @@
 # Exim test configuration 0311
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0312 b/test/confs/0312
index a9566983e..474e7f5ef 100644
--- a/test/confs/0312
+++ b/test/confs/0312
@@ -1,6 +1,7 @@
 # Exim test configuration 0312
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0313 b/test/confs/0313
index e773e3bf1..34b9edca9 100644
--- a/test/confs/0313
+++ b/test/confs/0313
@@ -1,6 +1,7 @@
 # Exim test configuration 0313
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0314 b/test/confs/0314
index 78ebf2156..7645b052d 100644
--- a/test/confs/0314
+++ b/test/confs/0314
@@ -1,6 +1,7 @@
 # Exim test configuration 0314
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0315 b/test/confs/0315
index 69525e734..63c0606b3 100644
--- a/test/confs/0315
+++ b/test/confs/0315
@@ -1,6 +1,7 @@
 # Exim test configuration 0315
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0316 b/test/confs/0316
index b953e6f51..4eb43a46b 100644
--- a/test/confs/0316
+++ b/test/confs/0316
@@ -1,6 +1,7 @@
 # Exim test configuration 0316
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0317 b/test/confs/0317
index 0c3d9e5fb..ee1989969 100644
--- a/test/confs/0317
+++ b/test/confs/0317
@@ -1,6 +1,7 @@
 # Exim test configuration 0317
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0318 b/test/confs/0318
index f4872b1b5..45b48db07 100644
--- a/test/confs/0318
+++ b/test/confs/0318
@@ -1,6 +1,7 @@
 # Exim test configuration 0318
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0319 b/test/confs/0319
index 62ad75b24..1c7e34bdf 100644
--- a/test/confs/0319
+++ b/test/confs/0319
@@ -1,6 +1,7 @@
 # Exim test configuration 0319
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0320 b/test/confs/0320
index d14802b7b..f811d9e47 100644
--- a/test/confs/0320
+++ b/test/confs/0320
@@ -1,6 +1,7 @@
 # Exim test configuration 0320
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0321 b/test/confs/0321
index c5227a37c..d0f6a4ac2 100644
--- a/test/confs/0321
+++ b/test/confs/0321
@@ -1,6 +1,7 @@
 # Exim test configuration 0321
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0322 b/test/confs/0322
index a33232ee6..e8f87bd9e 100644
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -3,6 +3,7 @@
 LS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0323 b/test/confs/0323
index a6d18c5d1..d39cb7599 100644
--- a/test/confs/0323
+++ b/test/confs/0323
@@ -1,6 +1,7 @@
 # Exim test configuration 0323
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0324 b/test/confs/0324
index a725195ae..5ad0ca6db 100644
--- a/test/confs/0324
+++ b/test/confs/0324
@@ -1,6 +1,7 @@
 # Exim test configuration 0324
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0325 b/test/confs/0325
index 5310dcc8d..5572f6aa7 100644
--- a/test/confs/0325
+++ b/test/confs/0325
@@ -1,6 +1,7 @@
 # Exim test configuration 0325
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0326 b/test/confs/0326
index 4b4f49fcc..257f50405 100644
--- a/test/confs/0326
+++ b/test/confs/0326
@@ -1,6 +1,7 @@
 # Exim test configuration 0326
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0327 b/test/confs/0327
index c055df0e6..89e209942 100644
--- a/test/confs/0327
+++ b/test/confs/0327
@@ -1,6 +1,7 @@
 # Exim test configuration 0327
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0328 b/test/confs/0328
index 29d732a60..40a5cf8a8 100644
--- a/test/confs/0328
+++ b/test/confs/0328
@@ -1,6 +1,7 @@
 # Exim test configuration 0328
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0329 b/test/confs/0329
index 4caeab003..221817e4a 100644
--- a/test/confs/0329
+++ b/test/confs/0329
@@ -1,6 +1,7 @@
 # Exim test configuration 0329
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0330 b/test/confs/0330
index d4ab3d46b..71e0645b8 100644
--- a/test/confs/0330
+++ b/test/confs/0330
@@ -1,6 +1,7 @@
 # Exim test configuration 0330
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0331 b/test/confs/0331
index ff3bf416c..cbcc9953b 100644
--- a/test/confs/0331
+++ b/test/confs/0331
@@ -1,6 +1,7 @@
 # Exim test configuration 0331
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0332 b/test/confs/0332
index f9ad188d6..988fb672c 100644
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -1,6 +1,7 @@
 # Exim test configuration 0332
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0333 b/test/confs/0333
index 3e97eb804..437aa89da 100644
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -1,6 +1,7 @@
 # Exim test configuration 0333
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0334 b/test/confs/0334
index 54c547db3..4cc0f6d6d 100644
--- a/test/confs/0334
+++ b/test/confs/0334
@@ -1,6 +1,7 @@
 # Exim test configuration 0334
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0335 b/test/confs/0335
index b6f6281af..b5ac16d61 100644
--- a/test/confs/0335
+++ b/test/confs/0335
@@ -1,6 +1,7 @@
 # Exim test configuration 0335
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0336 b/test/confs/0336
index fb6b05f23..5f4556b97 100644
--- a/test/confs/0336
+++ b/test/confs/0336
@@ -1,6 +1,7 @@
 # Exim test configuration 0336
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0337 b/test/confs/0337
index 4a8f4e48e..631416ac7 100644
--- a/test/confs/0337
+++ b/test/confs/0337
@@ -1,6 +1,7 @@
 # Exim test configuration 0337
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0338 b/test/confs/0338
index 506a5ba3a..d888e9925 100644
--- a/test/confs/0338
+++ b/test/confs/0338
@@ -1,6 +1,7 @@
 # Exim test configuration 0338
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0339 b/test/confs/0339
index 720481cca..6cc13fdb9 100644
--- a/test/confs/0339
+++ b/test/confs/0339
@@ -1,6 +1,7 @@
 # Exim test configuration 0339
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0340 b/test/confs/0340
index 2184b4d8c..4b364270d 100644
--- a/test/confs/0340
+++ b/test/confs/0340
@@ -1,6 +1,7 @@
 # Exim test configuration 0340
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0341 b/test/confs/0341
index 1719d5d47..3924119ef 100644
--- a/test/confs/0341
+++ b/test/confs/0341
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0342 b/test/confs/0342
index 4c55b2381..9f7d1e397 100644
--- a/test/confs/0342
+++ b/test/confs/0342
@@ -1,6 +1,7 @@
 # Exim test configuration 0342
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0343 b/test/confs/0343
index a69498934..465f529b1 100644
--- a/test/confs/0343
+++ b/test/confs/0343
@@ -1,6 +1,7 @@
 # Exim test configuration 0343
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0344 b/test/confs/0344
index 52437504e..0e898ef49 100644
--- a/test/confs/0344
+++ b/test/confs/0344
@@ -1,6 +1,7 @@
 # Exim test configuration 0344
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0345 b/test/confs/0345
index d0e855f7b..04845c4a4 100644
--- a/test/confs/0345
+++ b/test/confs/0345
@@ -1,6 +1,7 @@
 # Exim test configuration 0345
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0346 b/test/confs/0346
index 770eba91f..1d8dc82fe 100644
--- a/test/confs/0346
+++ b/test/confs/0346
@@ -1,6 +1,7 @@
 # Exim test configuration 0346
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0347 b/test/confs/0347
index 91da97aef..c7e0e79a6 100644
--- a/test/confs/0347
+++ b/test/confs/0347
@@ -1,6 +1,7 @@
 # Exim test configuration 0347
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0348 b/test/confs/0348
index ecbc00785..022aa83cc 100644
--- a/test/confs/0348
+++ b/test/confs/0348
@@ -3,6 +3,7 @@
 RETRY=G,1,20m,1.5
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0349 b/test/confs/0349
index edede234e..4b27bd215 100644
--- a/test/confs/0349
+++ b/test/confs/0349
@@ -1,6 +1,7 @@
 # Exim test configuration 0349
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0350 b/test/confs/0350
index 8dec55d70..3acf8eb22 100644
--- a/test/confs/0350
+++ b/test/confs/0350
@@ -1,6 +1,7 @@
 # Exim test configuration 592
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0351 b/test/confs/0351
index 78820f2d9..724f224a9 100644
--- a/test/confs/0351
+++ b/test/confs/0351
@@ -1,6 +1,7 @@
 # Exim test configuration 0351
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0352 b/test/confs/0352
index a2ae86ff1..ebab590d5 100644
--- a/test/confs/0352
+++ b/test/confs/0352
@@ -1,6 +1,7 @@
 # Exim test configuration 0352
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0353 b/test/confs/0353
index 5fdd04e9e..82deada4f 100644
--- a/test/confs/0353
+++ b/test/confs/0353
@@ -1,6 +1,7 @@
 # Exim test configuration 0353
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0354 b/test/confs/0354
index d40b4f553..d0eb7675d 100644
--- a/test/confs/0354
+++ b/test/confs/0354
@@ -1,6 +1,7 @@
 # Exim test configuration 0354
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0355 b/test/confs/0355
index 9b86cca2e..0fbdaae7f 100644
--- a/test/confs/0355
+++ b/test/confs/0355
@@ -1,6 +1,7 @@
 # Exim test configuration 0355
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0356 b/test/confs/0356
index e93211904..8dae9f399 100644
--- a/test/confs/0356
+++ b/test/confs/0356
@@ -3,6 +3,7 @@
 MESSAGE_LOGS =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0357 b/test/confs/0357
index 560676b14..cc28f95eb 100644
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -1,6 +1,7 @@
 # Exim test configuration 0357
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0358 b/test/confs/0358
index e66020b69..a89d04d4d 100644
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -1,6 +1,7 @@
 # Exim test configuration 0358
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0359 b/test/confs/0359
index c24f6f10b..1b0e8f318 100644
--- a/test/confs/0359
+++ b/test/confs/0359
@@ -1,6 +1,7 @@
 # Exim test configuration 0359
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0360 b/test/confs/0360
index 0275cbd5c..9ed8756fb 100644
--- a/test/confs/0360
+++ b/test/confs/0360
@@ -1,6 +1,7 @@
 # Exim test configuration 0360
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0361 b/test/confs/0361
index ea1f39192..c0c54b52d 100644
--- a/test/confs/0361
+++ b/test/confs/0361
@@ -1,6 +1,7 @@
 # Exim test configuration 0361
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0362 b/test/confs/0362
index 1568939b4..9ce8894ef 100644
--- a/test/confs/0362
+++ b/test/confs/0362
@@ -1,6 +1,7 @@
 # Exim test configuration 0362
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0363 b/test/confs/0363
index 5b7185d42..737c3af18 100644
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -1,6 +1,7 @@
 # Exim test configuration 0363
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0364 b/test/confs/0364
index 0ae70d664..c37ce6c71 100644
--- a/test/confs/0364
+++ b/test/confs/0364
@@ -1,6 +1,7 @@
 # Exim test configuration 0364
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0365 b/test/confs/0365
index 54e24e6d4..07534aa81 100644
--- a/test/confs/0365
+++ b/test/confs/0365
@@ -4,6 +4,7 @@ DETAILS=false
 SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0366 b/test/confs/0366
index 930b6467d..ebde0553e 100644
--- a/test/confs/0366
+++ b/test/confs/0366
@@ -3,6 +3,7 @@
 HOSTS_MAX_TRY=5
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0367 b/test/confs/0367
index f9a8d1ca5..2eddd2987 100644
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -1,6 +1,7 @@
 # Exim test configuration 0367
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0368 b/test/confs/0368
index 91174204e..eabb9153c 100644
--- a/test/confs/0368
+++ b/test/confs/0368
@@ -1,6 +1,7 @@
 # Exim test configuration 0368
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0369 b/test/confs/0369
index 879b77eb5..2bfc304ff 100644
--- a/test/confs/0369
+++ b/test/confs/0369
@@ -1,6 +1,7 @@
 # Exim test configuration 0369
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0370 b/test/confs/0370
index f1f8a55f3..a6ef7fb29 100644
--- a/test/confs/0370
+++ b/test/confs/0370
@@ -1,6 +1,7 @@
 # Exim test configuration 0370
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0371 b/test/confs/0371
index a13d7cd3f..f7236f8e7 100644
--- a/test/confs/0371
+++ b/test/confs/0371
@@ -1,6 +1,7 @@
 # Exim test configuration 0371
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0372 b/test/confs/0372
index af03b3a37..ae690c52a 100644
--- a/test/confs/0372
+++ b/test/confs/0372
@@ -3,6 +3,7 @@
 STRICT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0373 b/test/confs/0373
index c02973a52..54cfc1274 100644
--- a/test/confs/0373
+++ b/test/confs/0373
@@ -1,6 +1,7 @@
 # Exim test configuration 0373
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0374 b/test/confs/0374
index 3c1381b8c..0f71cdd4d 100644
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -1,6 +1,7 @@
 # Exim test configuration 0374
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0375 b/test/confs/0375
index a1322bbed..79b8d22a7 100644
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -1,6 +1,7 @@
 # Exim test configuration 0375
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0376 b/test/confs/0376
index d86d1dd55..897c53873 100644
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -3,6 +3,7 @@
 PEX=10s
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0377 b/test/confs/0377
index a08b49478..5e5f4cda8 100644
--- a/test/confs/0377
+++ b/test/confs/0377
@@ -1,6 +1,7 @@
 # Exim test configuration 0377
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0378 b/test/confs/0378
index 9eaca09af..102d897ef 100644
--- a/test/confs/0378
+++ b/test/confs/0378
@@ -1,6 +1,7 @@
 # Exim test configuration 0378
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0379 b/test/confs/0379
index 81a38a284..96b518c9b 100644
--- a/test/confs/0379
+++ b/test/confs/0379
@@ -1,6 +1,7 @@
 # Exim test configuration 0379
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0380 b/test/confs/0380
index c6bdb5a3b..b687107ee 100644
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -1,6 +1,7 @@
 # Exim test configuration 0380
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0381 b/test/confs/0381
index 8d930c6dc..0b2600b91 100644
--- a/test/confs/0381
+++ b/test/confs/0381
@@ -1,6 +1,7 @@
 # Exim test configuration 0381
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0382 b/test/confs/0382
index 4fad2b69d..321823589 100644
--- a/test/confs/0382
+++ b/test/confs/0382
@@ -1,6 +1,7 @@
 # Exim test configuration 0382
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0383 b/test/confs/0383
index fbb4029da..9d3504d11 100644
--- a/test/confs/0383
+++ b/test/confs/0383
@@ -1,6 +1,7 @@
 # Exim test configuration 0383
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0384 b/test/confs/0384
index 225a2430a..5f0cf209c 100644
--- a/test/confs/0384
+++ b/test/confs/0384
@@ -1,6 +1,7 @@
 # Exim test configuration 0384
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0385 b/test/confs/0385
index 85172e6de..7442448de 100644
--- a/test/confs/0385
+++ b/test/confs/0385
@@ -1,6 +1,7 @@
 # Exim test configuration 0385
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0386 b/test/confs/0386
index f88f1b044..a33ffe336 100644
--- a/test/confs/0386
+++ b/test/confs/0386
@@ -1,6 +1,7 @@
 # Exim test configuration 0386
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0387 b/test/confs/0387
index c1100f493..e75c8477f 100644
--- a/test/confs/0387
+++ b/test/confs/0387
@@ -1,6 +1,7 @@
 # Exim test configuration 0387
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0388 b/test/confs/0388
index 0252cbd9e..2ae5d43f2 100644
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -1,6 +1,7 @@
 # Exim test configuration 0388
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0389 b/test/confs/0389
index fb9f530f1..f2dba139a 100644
--- a/test/confs/0389
+++ b/test/confs/0389
@@ -1,6 +1,7 @@
 # Exim test configuration 0389
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0390 b/test/confs/0390
index d6e5b9cd8..f32f50cb8 100644
--- a/test/confs/0390
+++ b/test/confs/0390
@@ -1,6 +1,7 @@
 # Exim test configuration 0390
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0391 b/test/confs/0391
index d094faa7a..e2aead6df 100644
--- a/test/confs/0391
+++ b/test/confs/0391
@@ -1,6 +1,7 @@
 # Exim test configuration 0391
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0392 b/test/confs/0392
index d7b0dc7e1..0f4dbad2d 100644
--- a/test/confs/0392
+++ b/test/confs/0392
@@ -1,6 +1,7 @@
 # Exim test configuration 0392
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0393 b/test/confs/0393
index c7bbf0046..80e3d293d 100644
--- a/test/confs/0393
+++ b/test/confs/0393
@@ -3,6 +3,7 @@
 FILTER=/bin/cat
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0394 b/test/confs/0394
index 1ccbe2e8f..651c30ece 100644
--- a/test/confs/0394
+++ b/test/confs/0394
@@ -3,6 +3,7 @@
 OPT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0395 b/test/confs/0395
index 09861c2de..5d101c3d2 100644
--- a/test/confs/0395
+++ b/test/confs/0395
@@ -3,6 +3,7 @@
 TRUSTED=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0396 b/test/confs/0396
index 96e16f6c7..a80ec3c5b 100644
--- a/test/confs/0396
+++ b/test/confs/0396
@@ -1,6 +1,7 @@
 # Exim test configuration 0396
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0397 b/test/confs/0397
index bce775a2e..9a9c5b645 100644
--- a/test/confs/0397
+++ b/test/confs/0397
@@ -1,6 +1,7 @@
 # Exim test configuration 0397
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0398 b/test/confs/0398
index 31c561765..81c6c7e07 100644
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -1,6 +1,7 @@
 # Exim test configuration 0398
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0399 b/test/confs/0399
index 7d5215b97..3c9e4c031 100644
--- a/test/confs/0399
+++ b/test/confs/0399
@@ -1,6 +1,7 @@
 # Exim test configuration 0399
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0400 b/test/confs/0400
index c7daad9f9..24346e036 100644
--- a/test/confs/0400
+++ b/test/confs/0400
@@ -3,6 +3,7 @@
 DATA=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0401 b/test/confs/0401
index d77af0c2b..0d2cbaa38 100644
--- a/test/confs/0401
+++ b/test/confs/0401
@@ -1,6 +1,7 @@
 # Exim test configuration 0401
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0402 b/test/confs/0402
index 2adc75704..502b78106 100644
--- a/test/confs/0402
+++ b/test/confs/0402
@@ -1,6 +1,7 @@
 # Exim test configuration 0402
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0403 b/test/confs/0403
index d0bd93de0..eeeb2f149 100644
--- a/test/confs/0403
+++ b/test/confs/0403
@@ -1,6 +1,7 @@
 # Exim test configuration 0403
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0404 b/test/confs/0404
index 75a59498e..cf5815e41 100644
--- a/test/confs/0404
+++ b/test/confs/0404
@@ -1,6 +1,7 @@
 # Exim test configuration 0404
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0405 b/test/confs/0405
index 1bffa68f3..3af711850 100644
--- a/test/confs/0405
+++ b/test/confs/0405
@@ -3,6 +3,7 @@
 UTF8=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0406 b/test/confs/0406
index fa4ad5161..582834819 100644
--- a/test/confs/0406
+++ b/test/confs/0406
@@ -1,6 +1,7 @@
 # Exim test configuration 0406
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0407 b/test/confs/0407
index 8be5532d1..c39b8d307 100644
--- a/test/confs/0407
+++ b/test/confs/0407
@@ -4,6 +4,7 @@ HEADER_MAXSIZE=
 HEADER_LINE_MAXSIZE=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0408 b/test/confs/0408
index e914ae983..4ea219951 100644
--- a/test/confs/0408
+++ b/test/confs/0408
@@ -1,6 +1,7 @@
 # Exim test configuration 0408
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0409 b/test/confs/0409
index be5b769a4..e856a4f41 100644
--- a/test/confs/0409
+++ b/test/confs/0409
@@ -3,6 +3,7 @@
 BANNER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0410 b/test/confs/0410
index b8da514f4..c2561b28d 100644
--- a/test/confs/0410
+++ b/test/confs/0410
@@ -1,6 +1,7 @@
 # Exim test configuration 0410
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0411 b/test/confs/0411
index b06489d10..d98421ca8 100644
--- a/test/confs/0411
+++ b/test/confs/0411
@@ -1,6 +1,7 @@
 # Exim test configuration 0411
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0412 b/test/confs/0412
index 708cf0a1f..b829727af 100644
--- a/test/confs/0412
+++ b/test/confs/0412
@@ -1,6 +1,7 @@
 # Exim test configuration 0412
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0413 b/test/confs/0413
index 8ae83dee3..5876d63ef 100644
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -1,6 +1,7 @@
 # Exim test configuration 0413
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0414 b/test/confs/0414
index 84ca827a3..97aa2bdee 100644
--- a/test/confs/0414
+++ b/test/confs/0414
@@ -1,6 +1,7 @@
 # Exim test configuration 0414
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0415 b/test/confs/0415
index 536eaa6c1..189b18e06 100644
--- a/test/confs/0415
+++ b/test/confs/0415
@@ -5,6 +5,7 @@ ARG2=1.0
 VALUE=0
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0416 b/test/confs/0416
index 08146e259..3bff9118d 100644
--- a/test/confs/0416
+++ b/test/confs/0416
@@ -1,6 +1,7 @@
 # Exim test configuration 0416
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0417 b/test/confs/0417
index 4052c570e..3fc99c897 100644
--- a/test/confs/0417
+++ b/test/confs/0417
@@ -3,6 +3,7 @@
 RETURN_ERROR_DETAILS = false
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0418 b/test/confs/0418
index 7df596962..b7516d82d 100644
--- a/test/confs/0418
+++ b/test/confs/0418
@@ -1,6 +1,7 @@
 # Exim test configuration 0418
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0419 b/test/confs/0419
index 72dfc6824..d3408ed11 100644
--- a/test/confs/0419
+++ b/test/confs/0419
@@ -1,6 +1,7 @@
 # Exim test configuration 0419
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0420 b/test/confs/0420
index 0ac496fd5..6704a06a0 100644
--- a/test/confs/0420
+++ b/test/confs/0420
@@ -1,6 +1,7 @@
 # Exim test configuration 0420
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0421 b/test/confs/0421
index a5feb10f0..a53349827 100644
--- a/test/confs/0421
+++ b/test/confs/0421
@@ -1,6 +1,7 @@
 # Exim test configuration 0421
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0422 b/test/confs/0422
index e913725e7..50c5f9853 100644
--- a/test/confs/0422
+++ b/test/confs/0422
@@ -1,6 +1,7 @@
 # Exim test configuration 0422
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0423 b/test/confs/0423
index 0f5ae85f6..8dc4a2a80 100644
--- a/test/confs/0423
+++ b/test/confs/0423
@@ -1,6 +1,7 @@
 # Exim test configuration 0423
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0424 b/test/confs/0424
index 16b4d6578..47d14d04a 100644
--- a/test/confs/0424
+++ b/test/confs/0424
@@ -1,6 +1,7 @@
 # Exim test configuration 0424
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0425 b/test/confs/0425
index 73e3fb81b..39952077b 100644
--- a/test/confs/0425
+++ b/test/confs/0425
@@ -1,6 +1,7 @@
 # Exim test configuration 0425
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0426 b/test/confs/0426
index b61fead03..a4db6b63d 100644
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -1,6 +1,7 @@
 # Exim test configuration 0426
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0427 b/test/confs/0427
index 156c7ace8..249b5f0d0 100644
--- a/test/confs/0427
+++ b/test/confs/0427
@@ -1,6 +1,7 @@
 # Exim test configuration 0427
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0428 b/test/confs/0428
index 60b49e476..2df61b844 100644
--- a/test/confs/0428
+++ b/test/confs/0428
@@ -1,6 +1,7 @@
 # Exim test configuration 0428
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0429 b/test/confs/0429
index 68e7a417a..bb2614808 100644
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -1,6 +1,7 @@
 # Exim test configuration 0429
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0430 b/test/confs/0430
index 847af4ed2..a43e0acb8 100644
--- a/test/confs/0430
+++ b/test/confs/0430
@@ -4,6 +4,7 @@ LIST=
 SELF=freeze
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0431 b/test/confs/0431
index 0cf942225..c1c8557dd 100644
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -3,6 +3,7 @@
 AFFIX=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0432 b/test/confs/0432
index 1f69870de..362f9ba3d 100644
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -1,6 +1,7 @@
 # Exim test configuration 0432
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0433 b/test/confs/0433
index 9183cc0c3..fad3cc5e7 100644
--- a/test/confs/0433
+++ b/test/confs/0433
@@ -5,6 +5,7 @@ IFACE=
 
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0434 b/test/confs/0434
index 808caa62c..fb068b290 100644
--- a/test/confs/0434
+++ b/test/confs/0434
@@ -3,6 +3,7 @@
 ELI=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0435 b/test/confs/0435
index 010f7cce7..cf10ab0c6 100644
--- a/test/confs/0435
+++ b/test/confs/0435
@@ -1,6 +1,7 @@
 # Exim test configuration 0435
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0436 b/test/confs/0436
index e944668d8..bd4b70f91 100644
--- a/test/confs/0436
+++ b/test/confs/0436
@@ -1,6 +1,7 @@
 # Exim test configuration 0436
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0437 b/test/confs/0437
index 73ad8b39e..55224c8d8 100644
--- a/test/confs/0437
+++ b/test/confs/0437
@@ -1,6 +1,7 @@
 # Exim test configuration 0437
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 
diff --git a/test/confs/0438 b/test/confs/0438
index 2b129db05..f97a4ee4c 100644
--- a/test/confs/0438
+++ b/test/confs/0438
@@ -1,6 +1,7 @@
 # Exim test configuration 0438
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0439 b/test/confs/0439
index 1d79e650b..c40031273 100644
--- a/test/confs/0439
+++ b/test/confs/0439
@@ -1,6 +1,7 @@
 # Exim test configuration 0439
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0440 b/test/confs/0440
index 9c3bb73de..eae1694fd 100644
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -1,6 +1,7 @@
 # Exim test configuration 0440
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0441 b/test/confs/0441
index 12931ec6a..727ddfc85 100644
--- a/test/confs/0441
+++ b/test/confs/0441
@@ -1,6 +1,7 @@
 # Exim test configuration 0441
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0442 b/test/confs/0442
index 604abab74..a3a9c7e76 100644
--- a/test/confs/0442
+++ b/test/confs/0442
@@ -3,6 +3,7 @@
 BAD=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0443 b/test/confs/0443
index 39f07bff9..b3aadb0bf 100644
--- a/test/confs/0443
+++ b/test/confs/0443
@@ -1,6 +1,7 @@
 # Exim test configuration 0443
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0444 b/test/confs/0444
index d696a9c8e..47bd15bbc 100644
--- a/test/confs/0444
+++ b/test/confs/0444
@@ -1,6 +1,7 @@
 # Exim test configuration 0444
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0445 b/test/confs/0445
index 55c65799a..c65c01280 100644
--- a/test/confs/0445
+++ b/test/confs/0445
@@ -1,6 +1,7 @@
 # Exim test configuration 0445
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0446 b/test/confs/0446
index f74289fe9..bb5951f6d 100644
--- a/test/confs/0446
+++ b/test/confs/0446
@@ -1,6 +1,7 @@
 # Exim test configuration 0446
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0447 b/test/confs/0447
index d3ce5f7ed..3e4b33ef9 100644
--- a/test/confs/0447
+++ b/test/confs/0447
@@ -3,6 +3,7 @@
 INSERT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0448 b/test/confs/0448
index cf70f2513..16ff9eb53 100644
--- a/test/confs/0448
+++ b/test/confs/0448
@@ -1,6 +1,7 @@
 # Exim test configuration 0448
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0449 b/test/confs/0449
index b67d267ca..e4e817b55 100644
--- a/test/confs/0449
+++ b/test/confs/0449
@@ -1,6 +1,7 @@
 # Exim test configuration 0449
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0450 b/test/confs/0450
index fa0b0272b..d9c3c59ee 100644
--- a/test/confs/0450
+++ b/test/confs/0450
@@ -3,6 +3,7 @@
 EXTRA=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0451 b/test/confs/0451
index 8c24991a9..043ae28f7 100644
--- a/test/confs/0451
+++ b/test/confs/0451
@@ -1,6 +1,7 @@
 # Exim test configuration 0451
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0452 b/test/confs/0452
index 59243205b..7fbd26dce 100644
--- a/test/confs/0452
+++ b/test/confs/0452
@@ -1,6 +1,7 @@
 # Exim test configuration 0452
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0453 b/test/confs/0453
index 87aa65b58..3be29e263 100644
--- a/test/confs/0453
+++ b/test/confs/0453
@@ -3,6 +3,7 @@
 LIMIT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0454 b/test/confs/0454
index d0c1844ea..648547e01 100644
--- a/test/confs/0454
+++ b/test/confs/0454
@@ -1,6 +1,7 @@
 # Exim test configuration 0454
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0455 b/test/confs/0455
index 14e4161f2..4f3f44044 100644
--- a/test/confs/0455
+++ b/test/confs/0455
@@ -3,6 +3,7 @@
 HOSTS_MAX_TRY=4
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0456 b/test/confs/0456
index 3adcce54a..94ecb8f6c 100644
--- a/test/confs/0456
+++ b/test/confs/0456
@@ -3,6 +3,7 @@
 HOSTS_MAX_TRY=4
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0457 b/test/confs/0457
index 162ed5611..537c458a2 100644
--- a/test/confs/0457
+++ b/test/confs/0457
@@ -1,6 +1,7 @@
 # Exim test configuration 0457
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0458 b/test/confs/0458
index 65fa24080..d06b7bfc4 100644
--- a/test/confs/0458
+++ b/test/confs/0458
@@ -1,6 +1,7 @@
 # Exim test configuration 0458
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0459 b/test/confs/0459
index f04d907fc..e6690b31b 100644
--- a/test/confs/0459
+++ b/test/confs/0459
@@ -1,6 +1,7 @@
 # Exim test configuration 0459
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0460 b/test/confs/0460
index 5c3483190..95f854b1d 100644
--- a/test/confs/0460
+++ b/test/confs/0460
@@ -1,6 +1,7 @@
 # Exim test configuration 0460
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0461 b/test/confs/0461
index 5b5110104..1eedad3bb 100644
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -6,6 +6,7 @@ RETRY1=1s
 RETRY2=2s
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0462 b/test/confs/0462
index 7ff47e6b5..e4c47a441 100644
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -3,6 +3,7 @@
 SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0463 b/test/confs/0463
index e81afcfb5..dd5322dab 100644
--- a/test/confs/0463
+++ b/test/confs/0463
@@ -1,6 +1,7 @@
 # Exim test configuration 0463
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0464 b/test/confs/0464
index 1709839b4..43c723a4f 100644
--- a/test/confs/0464
+++ b/test/confs/0464
@@ -1,6 +1,7 @@
 # Exim test configuration 0464
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0465 b/test/confs/0465
index 32c1664cd..f20847936 100644
--- a/test/confs/0465
+++ b/test/confs/0465
@@ -3,6 +3,7 @@
 STD=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0466 b/test/confs/0466
index 575f2ce60..38935973f 100644
--- a/test/confs/0466
+++ b/test/confs/0466
@@ -1,6 +1,7 @@
 # Exim test configuration 0466
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0467 b/test/confs/0467
index 56011f4a3..02a566a48 100644
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -3,6 +3,7 @@
 SRV=smtp
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0468 b/test/confs/0468
index 293e061fd..4e640f64d 100644
--- a/test/confs/0468
+++ b/test/confs/0468
@@ -3,6 +3,7 @@
 SRV=smtp
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0469 b/test/confs/0469
index 45901515c..e4e0365c1 100644
--- a/test/confs/0469
+++ b/test/confs/0469
@@ -3,6 +3,7 @@
 SRV=smtp
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0470 b/test/confs/0470
index 69fd848e4..52042ec23 100644
--- a/test/confs/0470
+++ b/test/confs/0470
@@ -3,6 +3,7 @@
 SRV=smtp
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0471 b/test/confs/0471
index df8daa9c2..10a8e5259 100644
--- a/test/confs/0471
+++ b/test/confs/0471
@@ -1,6 +1,7 @@
 # Exim test configuration 0471
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0472 b/test/confs/0472
index f134e1e00..c817f26e1 100644
--- a/test/confs/0472
+++ b/test/confs/0472
@@ -3,6 +3,7 @@
 FUSER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0473 b/test/confs/0473
index acbe1ff8c..d8cac49a8 100644
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -4,6 +4,7 @@ USE_SENDER = ,use_sender
 ACL_RCPT = acl_rcpt
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0474 b/test/confs/0474
index 4596e3922..2c4598714 100644
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -1,6 +1,7 @@
 # Exim test configuration 0474
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0475 b/test/confs/0475
index ff050bd53..22d1268ff 100644
--- a/test/confs/0475
+++ b/test/confs/0475
@@ -1,6 +1,7 @@
 # Exim test configuration 0475
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0476 b/test/confs/0476
index baa3f15a5..001726ff3 100644
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -1,6 +1,7 @@
 # Exim test configuration 0476
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0477 b/test/confs/0477
index 5296ab4db..cf835dbd3 100644
--- a/test/confs/0477
+++ b/test/confs/0477
@@ -1,6 +1,7 @@
 # Exim test configuration 0477
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0478 b/test/confs/0478
index bcdd98069..4879d1926 100644
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0479 b/test/confs/0479
index 18c32d947..e19773134 100644
--- a/test/confs/0479
+++ b/test/confs/0479
@@ -1,6 +1,7 @@
 # Exim test configuration 0479
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0480 b/test/confs/0480
index c8adb1ba5..095b00d95 100644
--- a/test/confs/0480
+++ b/test/confs/0480
@@ -7,6 +7,7 @@ IP3=V4NET.0.0.3
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0481 b/test/confs/0481
index 212af518d..966d766ed 100644
--- a/test/confs/0481
+++ b/test/confs/0481
@@ -1,6 +1,7 @@
 # Exim test configuration 0481
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0482 b/test/confs/0482
index 787c42367..892ec7063 100644
--- a/test/confs/0482
+++ b/test/confs/0482
@@ -1,6 +1,7 @@
 # Exim test configuration 0482
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0483 b/test/confs/0483
index 753048bc4..c6a8b4b4e 100644
--- a/test/confs/0483
+++ b/test/confs/0483
@@ -1,6 +1,7 @@
 # Exim test configuration 0483
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0484 b/test/confs/0484
index 641006006..2b9652be5 100644
--- a/test/confs/0484
+++ b/test/confs/0484
@@ -1,6 +1,7 @@
 # Exim test configuration 0484
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0485 b/test/confs/0485
index 6be2c23ad..a05980478 100644
--- a/test/confs/0485
+++ b/test/confs/0485
@@ -1,6 +1,7 @@
 # Exim test configuration 0485
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0486 b/test/confs/0486
index bebc361bc..3efc95b1d 100644
--- a/test/confs/0486
+++ b/test/confs/0486
@@ -1,6 +1,7 @@
 # Exim test configuration 0486
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0487 b/test/confs/0487
index dcf22623b..0c40e6e7a 100644
--- a/test/confs/0487
+++ b/test/confs/0487
@@ -1,6 +1,7 @@
 # Exim test configuration 0487
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0488 b/test/confs/0488
index 49261fa31..827700c6a 100644
--- a/test/confs/0488
+++ b/test/confs/0488
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0489 b/test/confs/0489
index 70e8dfe17..76336941d 100644
--- a/test/confs/0489
+++ b/test/confs/0489
@@ -1,6 +1,7 @@
 # Exim test configuration 0489
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0490 b/test/confs/0490
index 29a99ba6c..3f730bc46 100644
--- a/test/confs/0490
+++ b/test/confs/0490
@@ -1,6 +1,7 @@
 # Exim test configuration 0490
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0491 b/test/confs/0491
index 100fb9a80..6c8fd2f9d 100644
--- a/test/confs/0491
+++ b/test/confs/0491
@@ -4,6 +4,7 @@ UL=abc@xyz
 REWRITE=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0492 b/test/confs/0492
index c17b11d98..7a09cad5b 100644
--- a/test/confs/0492
+++ b/test/confs/0492
@@ -1,6 +1,7 @@
 # Exim test configuration 0492
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0493 b/test/confs/0493
index 171617496..bb749150a 100644
--- a/test/confs/0493
+++ b/test/confs/0493
@@ -1,6 +1,7 @@
 # Exim test configuration 0493
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0494 b/test/confs/0494
index 4426c2a67..19069e2f6 100644
--- a/test/confs/0494
+++ b/test/confs/0494
@@ -1,6 +1,7 @@
 # Exim test configuration 0494
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0495 b/test/confs/0495
index 8706c790b..816f71955 100644
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -1,6 +1,7 @@
 # Exim test configuration 0495
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0496 b/test/confs/0496
index 9b03b850f..a83059ca5 100644
--- a/test/confs/0496
+++ b/test/confs/0496
@@ -1,6 +1,7 @@
 # Exim test configuration 0496
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0497 b/test/confs/0497
index 23748aedf..fc2714e25 100644
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -1,6 +1,7 @@
 # Exim test configuration 0497
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0498 b/test/confs/0498
index b00c634ae..8f01c3c5b 100644
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -1,6 +1,7 @@
 # Exim test configuration 0498
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0499 b/test/confs/0499
index ada9e8aa5..446cc69b4 100644
--- a/test/confs/0499
+++ b/test/confs/0499
@@ -1,6 +1,7 @@
 # Exim test configuration 0499
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0500 b/test/confs/0500
index b069d2e01..08cd5b9cb 100644
--- a/test/confs/0500
+++ b/test/confs/0500
@@ -1,6 +1,7 @@
 # Exim test configuration 0500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0501 b/test/confs/0501
index 258c5e05f..59a473d4f 100644
--- a/test/confs/0501
+++ b/test/confs/0501
@@ -1,6 +1,7 @@
 # Exim test configuration 0501
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0502 b/test/confs/0502
index 10e2abc4a..611bb9e5c 100644
--- a/test/confs/0502
+++ b/test/confs/0502
@@ -3,6 +3,7 @@
 LAST=accept message = Your message here
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0503 b/test/confs/0503
index bd3ba5b12..1d87cd703 100644
--- a/test/confs/0503
+++ b/test/confs/0503
@@ -3,6 +3,7 @@
 MSIZE=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0504 b/test/confs/0504
index f604f5e5d..4a3cb0f54 100644
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -1,6 +1,7 @@
 # Exim test configuration 0504
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0505 b/test/confs/0505
index f6136a435..f60ba2568 100644
--- a/test/confs/0505
+++ b/test/confs/0505
@@ -5,6 +5,7 @@ CONTROL=
 RECIPIENT=acl_smtp_rcpt=accept
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0506 b/test/confs/0506
index fb18b9b95..137070000 100644
--- a/test/confs/0506
+++ b/test/confs/0506
@@ -4,6 +4,7 @@ ALLOW=allow_filter
 FORBID=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0507 b/test/confs/0507
index 81338cebb..525976f11 100644
--- a/test/confs/0507
+++ b/test/confs/0507
@@ -3,6 +3,7 @@
 ERROR_DETAILS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0508 b/test/confs/0508
index 2920ad6ee..55a54a39f 100644
--- a/test/confs/0508
+++ b/test/confs/0508
@@ -1,6 +1,7 @@
 # Exim test configuration 0508
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0509 b/test/confs/0509
index 16fae0aba..794fec0d6 100644
--- a/test/confs/0509
+++ b/test/confs/0509
@@ -1,6 +1,7 @@
 # Exim test configuration 0509
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0510 b/test/confs/0510
index ce40aa35c..9d9452ad0 100644
--- a/test/confs/0510
+++ b/test/confs/0510
@@ -1,6 +1,7 @@
 # Exim test configuration 0510
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0511 b/test/confs/0511
index f76721ac9..307fa6ee8 100644
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -1,6 +1,7 @@
 # Exim test configuration 0511
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0512 b/test/confs/0512
index 1b10e218a..0eb88aef1 100644
--- a/test/confs/0512
+++ b/test/confs/0512
@@ -3,6 +3,7 @@
 HARDLIMIT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0513 b/test/confs/0513
index 0db220b99..4501b3dec 100644
--- a/test/confs/0513
+++ b/test/confs/0513
@@ -3,6 +3,7 @@
 HARDLIMIT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0514 b/test/confs/0514
index 29fee7e3b..4512ce263 100644
--- a/test/confs/0514
+++ b/test/confs/0514
@@ -1,6 +1,7 @@
 # Exim test configuration 0514
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0515 b/test/confs/0515
index 4fb8f5b6c..1fce1e34d 100644
--- a/test/confs/0515
+++ b/test/confs/0515
@@ -1,6 +1,7 @@
 # Exim test configuration 0515
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0516 b/test/confs/0516
index 74445af14..8b87b41f8 100644
--- a/test/confs/0516
+++ b/test/confs/0516
@@ -1,6 +1,7 @@
 # Exim test configuration 0516
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0517 b/test/confs/0517
index 1b10c8ea4..6fc1a5080 100644
--- a/test/confs/0517
+++ b/test/confs/0517
@@ -3,6 +3,7 @@
 ERROR_DETAILS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0518 b/test/confs/0518
index 2c200f07f..fc55cbd92 100644
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -1,6 +1,7 @@
 # Exim test configuration 0518
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0519 b/test/confs/0519
index c516fa84c..c7d7620ee 100644
--- a/test/confs/0519
+++ b/test/confs/0519
@@ -1,6 +1,7 @@
 # Exim test configuration 0519
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0520 b/test/confs/0520
index 65e57ca4e..26ec36b1c 100644
--- a/test/confs/0520
+++ b/test/confs/0520
@@ -1,6 +1,7 @@
 # Exim test configuration 0520
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0521 b/test/confs/0521
index fbd8f9331..68bcfdcc5 100644
--- a/test/confs/0521
+++ b/test/confs/0521
@@ -1,6 +1,7 @@
 # Exim test configuration 0521
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0522 b/test/confs/0522
index 6b410b3a5..9aa2843ce 100644
--- a/test/confs/0522
+++ b/test/confs/0522
@@ -3,6 +3,7 @@
 TIMEOUTDEFER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0523 b/test/confs/0523
index cfb9ea4a5..7b2f14ece 100644
--- a/test/confs/0523
+++ b/test/confs/0523
@@ -1,6 +1,7 @@
 # Exim test configuration 0523
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0524 b/test/confs/0524
index 0e6550cf6..c4abb4fac 100644
--- a/test/confs/0524
+++ b/test/confs/0524
@@ -1,6 +1,7 @@
 # Exim test configuration 0524
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0525 b/test/confs/0525
index d8f24ae54..eee880914 100644
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -1,6 +1,7 @@
 # Exim test configuration 0525
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0526 b/test/confs/0526
index 7f912b172..4d1b347ad 100644
--- a/test/confs/0526
+++ b/test/confs/0526
@@ -1,6 +1,7 @@
 # Exim test configuration 0526
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0527 b/test/confs/0527
index f5a78699e..2ad25cb49 100644
--- a/test/confs/0527
+++ b/test/confs/0527
@@ -1,6 +1,7 @@
 # Exim test configuration 0527
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0528 b/test/confs/0528
index 69ac8547e..6c0c009fd 100644
--- a/test/confs/0528
+++ b/test/confs/0528
@@ -1,6 +1,7 @@
 # Exim test configuration 0528
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0529 b/test/confs/0529
index 247f7452a..b06a97645 100644
--- a/test/confs/0529
+++ b/test/confs/0529
@@ -1,6 +1,7 @@
 # Exim test configuration 0529
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0530 b/test/confs/0530
index b7ad3ffd2..5b7207d20 100644
--- a/test/confs/0530
+++ b/test/confs/0530
@@ -1,6 +1,7 @@
 # Exim test configuration 0530
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0531 b/test/confs/0531
index 56f679ed8..a0d7fc2cd 100644
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -1,6 +1,7 @@
 # Exim test configuration 0531
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0532 b/test/confs/0532
index 42d613b19..9f8ade244 100644
--- a/test/confs/0532
+++ b/test/confs/0532
@@ -3,6 +3,7 @@
 CONNECTCOND=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0533 b/test/confs/0533
index c43b628ee..9bf49f07a 100644
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -1,6 +1,7 @@
 # Exim test configuration 0533
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0534 b/test/confs/0534
index b148987a5..81d68d1c7 100644
--- a/test/confs/0534
+++ b/test/confs/0534
@@ -1,6 +1,7 @@
 # Exim test configuration 0534
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0535 b/test/confs/0535
index a45a374b7..6cc0c0ec5 100644
--- a/test/confs/0535
+++ b/test/confs/0535
@@ -1,6 +1,7 @@
 # Exim test configuration 0535
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0536 b/test/confs/0536
index 0aa7c5201..c81074379 100644
--- a/test/confs/0536
+++ b/test/confs/0536
@@ -3,6 +3,7 @@
 FORBID_SMTP_CODE = false
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0537 b/test/confs/0537
index d273af997..b8be51d02 100644
--- a/test/confs/0537
+++ b/test/confs/0537
@@ -3,6 +3,7 @@
 TRUSTED=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0538 b/test/confs/0538
index 5865e3110..7e0a692a0 100644
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -1,6 +1,7 @@
 # Exim test configuration 0538
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0539 b/test/confs/0539
index 02b7a2622..9d7012156 100644
--- a/test/confs/0539
+++ b/test/confs/0539
@@ -1,6 +1,7 @@
 # Exim test configuration 0539
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0540 b/test/confs/0540
index 641335f6b..39902df6f 100644
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -1,6 +1,7 @@
 # Exim test configuration 0540
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0541 b/test/confs/0541
index 0b3be92bf..ba8bd7864 100644
--- a/test/confs/0541
+++ b/test/confs/0541
@@ -1,6 +1,7 @@
 # Exim test configuration 0541
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0542 b/test/confs/0542
index d22695158..4e5310dae 100644
--- a/test/confs/0542
+++ b/test/confs/0542
@@ -1,6 +1,7 @@
 # Exim test configuration 0542
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0543 b/test/confs/0543
index e68280b0e..f500ea99b 100644
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -1,6 +1,7 @@
 # Exim test configuration 0543
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0544 b/test/confs/0544
index ddf95e5ae..8a5f24a0e 100644
--- a/test/confs/0544
+++ b/test/confs/0544
@@ -1,6 +1,7 @@
 # Exim test configuration 0544
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0545 b/test/confs/0545
index 56888183d..e086a6a96 100644
--- a/test/confs/0545
+++ b/test/confs/0545
@@ -1,6 +1,7 @@
 # Exim test configuration 0545
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0546 b/test/confs/0546
index 736c126a8..0a89a27c5 100644
--- a/test/confs/0546
+++ b/test/confs/0546
@@ -4,6 +4,7 @@ HELO_MSG=One line
 RCPT_MSG=RCPT is OK
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0547 b/test/confs/0547
index d5f2fcce7..94541b2d6 100644
--- a/test/confs/0547
+++ b/test/confs/0547
@@ -3,6 +3,7 @@
 MAXNM = 100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0548 b/test/confs/0548
index 6306943de..b5370a4fa 100644
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0549 b/test/confs/0549
index 280d4d06c..993a8b510 100644
--- a/test/confs/0549
+++ b/test/confs/0549
@@ -1,6 +1,7 @@
 # Exim test configuration 0549
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0550 b/test/confs/0550
index e08750fdd..4c9a09280 100644
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -1,6 +1,7 @@
 # Exim test configuration 0550
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0551 b/test/confs/0551
index cecaae490..5424fb5aa 100644
--- a/test/confs/0551
+++ b/test/confs/0551
@@ -3,6 +3,7 @@
 LS=+pid
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0552 b/test/confs/0552
index 3ce775148..f12983f74 100644
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -4,6 +4,7 @@ DDF=
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0553 b/test/confs/0553
index bdbc8df48..f720a2c6d 100644
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -4,6 +4,7 @@ DCF =
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0554 b/test/confs/0554
index edeb977fa..c21f804f3 100644
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -1,6 +1,7 @@
 # Exim test configuration 0554
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0555 b/test/confs/0555
index 07b3a59ca..fa918168b 100644
--- a/test/confs/0555
+++ b/test/confs/0555
@@ -3,6 +3,7 @@
 FAKE=fakereject
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0556 b/test/confs/0556
index 7ed0105ed..de732b804 100644
--- a/test/confs/0556
+++ b/test/confs/0556
@@ -6,6 +6,7 @@ ACL_PREDATA=accept
 PAH=127.0.0.1
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0557 b/test/confs/0557
index 3b134db34..222221011 100644
--- a/test/confs/0557
+++ b/test/confs/0557
@@ -6,6 +6,7 @@ HOSTS=
 HAI=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0558 b/test/confs/0558
index 18fe64990..e98f926be 100644
--- a/test/confs/0558
+++ b/test/confs/0558
@@ -1,6 +1,7 @@
 # Exim test configuration 0558
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0559 b/test/confs/0559
index c148d9e9d..7c6a81d43 100644
--- a/test/confs/0559
+++ b/test/confs/0559
@@ -1,6 +1,7 @@
 # Exim test configuration 0559
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0560 b/test/confs/0560
index d5f538461..6bf304fea 100644
--- a/test/confs/0560
+++ b/test/confs/0560
@@ -1,6 +1,7 @@
 # Exim test configuration 0560
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0561 b/test/confs/0561
index ecdbf9504..12a87c373 100644
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -3,6 +3,7 @@
 QOLL=true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0562 b/test/confs/0562
index 51343f61a..294925aec 100644
--- a/test/confs/0562
+++ b/test/confs/0562
@@ -1,6 +1,7 @@
 # Exim test configuration 0562
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0563 b/test/confs/0563
index ac9839fa2..157c109a4 100644
--- a/test/confs/0563
+++ b/test/confs/0563
@@ -1,5 +1,7 @@
+exim_path = EXIM_PATH
 qualify_domain = testexim.test.ex
 localpartlist aliases = joe:sam:tom
+keep_environment =
 
 begin routers
 
diff --git a/test/confs/0564 b/test/confs/0564
index e10445be7..f16848e30 100644
--- a/test/confs/0564
+++ b/test/confs/0564
@@ -1,6 +1,7 @@
 # Exim test configuration 0564
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/0565 b/test/confs/0565
index c51fd6354..729473c33 100644
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -1,6 +1,7 @@
 # Exim test configuration 0565
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0566 b/test/confs/0566
index 83e97fb18..9de6ff3cd 100644
--- a/test/confs/0566
+++ b/test/confs/0566
@@ -1,6 +1,7 @@
 # Exim test configuration 0566
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0567 b/test/confs/0567
index 7348b1fe5..57a0fd8e3 100644
--- a/test/confs/0567
+++ b/test/confs/0567
@@ -3,6 +3,7 @@
 CONNECTCOND=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0568 b/test/confs/0568
index dec5b0dbc..403064314 100644
--- a/test/confs/0568
+++ b/test/confs/0568
@@ -2,6 +2,7 @@
 # Recipient callout with AUTH
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0615 b/test/confs/0615
new file mode 100644
index 000000000..bbfc4978a
--- /dev/null
+++ b/test/confs/0615
@@ -0,0 +1,6 @@
+# exim test configuration 0615
+exim_path = EXIM_PATH
+tls_advertise_hosts =
+perl_startup = $| = 1; \
+	print "Environment visible in Perl:\n"; \
+	print map { "$_=$ENV{$_}\n" } sort keys %ENV;
diff --git a/test/confs/0616 b/test/confs/0616
new file mode 100644
index 000000000..7962d9734
--- /dev/null
+++ b/test/confs/0616
@@ -0,0 +1,8 @@
+# exim test configuration 0616
+exim_path = EXIM_PATH
+keep_environment = ^FOO\d : BAR
+add_environment = ADDED1=added1 : ADDED2=added2
+tls_advertise_hosts =
+perl_startup = $| = 1; \
+	print "Environment visible in Perl:\n"; \
+	print map { "$_=$ENV{$_}\n" } sort keys %ENV;
diff --git a/test/confs/1000 b/test/confs/1000
index 90c233d16..7f815d7ef 100644
--- a/test/confs/1000
+++ b/test/confs/1000
@@ -3,6 +3,7 @@
 HL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/1001 b/test/confs/1001
index 5341fc8e8..9d4efa294 100644
--- a/test/confs/1001
+++ b/test/confs/1001
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/1002 b/test/confs/1002
index 5520cea4a..0f1bce027 100644
--- a/test/confs/1002
+++ b/test/confs/1002
@@ -1,6 +1,7 @@
 # Exim test configuration 1002
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/1003 b/test/confs/1003
index 00cb5c13c..617a96293 100644
--- a/test/confs/1003
+++ b/test/confs/1003
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/1005 b/test/confs/1005
index dfeee38ad..51cd98ada 100644
--- a/test/confs/1005
+++ b/test/confs/1005
@@ -1,6 +1,7 @@
 # Exim test configuration 1005
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/1006 b/test/confs/1006
index 21ce5a47e..89960d33f 100644
--- a/test/confs/1006
+++ b/test/confs/1006
@@ -4,6 +4,7 @@ SERVER=
 D6=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/1007 b/test/confs/1007
index 1091eea25..3a044381e 100644
--- a/test/confs/1007
+++ b/test/confs/1007
@@ -5,6 +5,7 @@ IFACE=
 
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/1008 b/test/confs/1008
index c00a67244..232eb7dcf 100644
--- a/test/confs/1008
+++ b/test/confs/1008
@@ -1,6 +1,7 @@
 # Exim test configuration 1008
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/1009 b/test/confs/1009
index a29187eae..ff00031b0 100644
--- a/test/confs/1009
+++ b/test/confs/1009
@@ -1,6 +1,7 @@
 # Exim test configuration 1009
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/1010 b/test/confs/1010
index 4a4929bcf..6ab5f51bb 100644
--- a/test/confs/1010
+++ b/test/confs/1010
@@ -1,6 +1,7 @@
 # Exim test configuration 1010
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2000 b/test/confs/2000
index 06e5a153c..ef322c8ce 100644
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2001 b/test/confs/2001
index 741796b67..846c8570e 100644
--- a/test/confs/2001
+++ b/test/confs/2001
@@ -4,6 +4,7 @@ OPTION=
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2002 b/test/confs/2002
index e8358da25..26a3bb3fa 100644
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -1,6 +1,7 @@
 # Exim test configuration 2002
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2003 b/test/confs/2003
index 12087aa62..03f467122 100644
--- a/test/confs/2003
+++ b/test/confs/2003
@@ -1,6 +1,7 @@
 # Exim test configuration 2003
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2004 b/test/confs/2004
index 280de5304..169db0130 100644
--- a/test/confs/2004
+++ b/test/confs/2004
@@ -1,6 +1,7 @@
 # Exim test configuration 2004
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2005 b/test/confs/2005
index 5448bf10c..4a6ffb293 100644
--- a/test/confs/2005
+++ b/test/confs/2005
@@ -1,6 +1,7 @@
 # Exim test configuration 2005
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2006 b/test/confs/2006
index 908783105..343f0fcf3 100644
--- a/test/confs/2006
+++ b/test/confs/2006
@@ -1,6 +1,7 @@
 # Exim test configuration 2006
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2007 b/test/confs/2007
index f3d150694..765dedabb 100644
--- a/test/confs/2007
+++ b/test/confs/2007
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2008 b/test/confs/2008
index 029c2f8d2..16254a9cd 100644
--- a/test/confs/2008
+++ b/test/confs/2008
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2009 b/test/confs/2009
index 11f7bf85b..a28126a68 100644
--- a/test/confs/2009
+++ b/test/confs/2009
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2010 b/test/confs/2010
index 2415c685e..edb54b2cf 100644
--- a/test/confs/2010
+++ b/test/confs/2010
@@ -5,6 +5,7 @@ TIMES =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2012 b/test/confs/2012
index 75fa54a1c..b4f2a294b 100644
--- a/test/confs/2012
+++ b/test/confs/2012
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2013 b/test/confs/2013
index 0be277259..3f78fd3c9 100644
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2014 b/test/confs/2014
index f657f060a..d54dcd9ce 100644
--- a/test/confs/2014
+++ b/test/confs/2014
@@ -3,6 +3,7 @@
 CRL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2015 b/test/confs/2015
index c062a211b..ecca4589f 100644
--- a/test/confs/2015
+++ b/test/confs/2015
@@ -1,6 +1,7 @@
 # Exim test configuration 2015
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2016 b/test/confs/2016
index fd53a63eb..4f919527e 100644
--- a/test/confs/2016
+++ b/test/confs/2016
@@ -1,6 +1,7 @@
 # Exim test configuration 2016
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/2017 b/test/confs/2017
index 14c724546..c3aa01247 100644
--- a/test/confs/2017
+++ b/test/confs/2017
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2018 b/test/confs/2018
index 8c75c536b..7e890a153 100644
--- a/test/confs/2018
+++ b/test/confs/2018
@@ -1,6 +1,7 @@
 # Exim test configuration 2018
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2019 b/test/confs/2019
index 8e63c05ae..255dce1f9 100644
--- a/test/confs/2019
+++ b/test/confs/2019
@@ -1,6 +1,7 @@
 # Exim test configuration 2019
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2020 b/test/confs/2020
index 6010a555e..cac7681bd 100644
--- a/test/confs/2020
+++ b/test/confs/2020
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
diff --git a/test/confs/2021 b/test/confs/2021
index efc7f76ff..c6d261578 100644
--- a/test/confs/2021
+++ b/test/confs/2021
@@ -4,6 +4,7 @@ REQUIRE=#
 TRYCLEAR=#
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2022 b/test/confs/2022
index 94dff6550..30ee7d8f0 100644
--- a/test/confs/2022
+++ b/test/confs/2022
@@ -1,6 +1,7 @@
 # Exim test configuration 2022
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2023 b/test/confs/2023
index 30db308a1..7c5804489 100644
--- a/test/confs/2023
+++ b/test/confs/2023
@@ -1,6 +1,7 @@
 # Exim test configuration 2023
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2024 b/test/confs/2024
index a677c4c86..10ce8f5df 100644
--- a/test/confs/2024
+++ b/test/confs/2024
@@ -4,6 +4,7 @@ CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2025 b/test/confs/2025
index b84407202..6d307e5c5 100644
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2026 b/test/confs/2026
index 4185e0b79..e6c7d6561 100644
--- a/test/confs/2026
+++ b/test/confs/2026
@@ -1,6 +1,7 @@
 # Exim test configuration 2026
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2027 b/test/confs/2027
index 0835fb760..33c329197 100644
--- a/test/confs/2027
+++ b/test/confs/2027
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2028 b/test/confs/2028
index df53268d6..c32fe34c6 100644
--- a/test/confs/2028
+++ b/test/confs/2028
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2029 b/test/confs/2029
index 1d691be27..e4e9e17ba 100644
--- a/test/confs/2029
+++ b/test/confs/2029
@@ -1,6 +1,7 @@
 # Exim test configuration 2029
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2100 b/test/confs/2100
index 791c6bd43..a59fd7b7e 100644
--- a/test/confs/2100
+++ b/test/confs/2100
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2101 b/test/confs/2101
index 73e0bdd7d..188d1ae9a 100644
--- a/test/confs/2101
+++ b/test/confs/2101
@@ -4,6 +4,7 @@ OPTION=
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2102 b/test/confs/2102
index 7f5771c0e..fd52eda49 100644
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -1,6 +1,7 @@
 # Exim test configuration 2102
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2103 b/test/confs/2103
index db3a4405b..aa5357c07 100644
--- a/test/confs/2103
+++ b/test/confs/2103
@@ -1,6 +1,7 @@
 # Exim test configuration 2103
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2104 b/test/confs/2104
index 5eb2f703d..b8e086095 100644
--- a/test/confs/2104
+++ b/test/confs/2104
@@ -1,6 +1,7 @@
 # Exim test configuration 2104
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2105 b/test/confs/2105
index cd3ffcc99..b269c78c2 100644
--- a/test/confs/2105
+++ b/test/confs/2105
@@ -1,6 +1,7 @@
 # Exim test configuration 2105
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2106 b/test/confs/2106
index c0f76e9c1..8cb0abf70 100644
--- a/test/confs/2106
+++ b/test/confs/2106
@@ -1,6 +1,7 @@
 # Exim test configuration 2106
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2107 b/test/confs/2107
index 7903eb966..f86377338 100644
--- a/test/confs/2107
+++ b/test/confs/2107
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2108 b/test/confs/2108
index 184abf806..5a0fe0125 100644
--- a/test/confs/2108
+++ b/test/confs/2108
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2109 b/test/confs/2109
index afbb03d5d..b37555a1b 100644
--- a/test/confs/2109
+++ b/test/confs/2109
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2110 b/test/confs/2110
index 1eb7ecb11..95ff5d466 100644
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -4,6 +4,7 @@ SERVER =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2111 b/test/confs/2111
index 075e11519..95515ceee 100644
--- a/test/confs/2111
+++ b/test/confs/2111
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2112 b/test/confs/2112
index 78733513e..282a38635 100644
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2113 b/test/confs/2113
index bff43ff57..9590b69bf 100644
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2114 b/test/confs/2114
index c395c73e0..270a2412e 100644
--- a/test/confs/2114
+++ b/test/confs/2114
@@ -3,6 +3,7 @@
 CRL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2115 b/test/confs/2115
index fdf184277..47846f0e8 100644
--- a/test/confs/2115
+++ b/test/confs/2115
@@ -1,6 +1,7 @@
 # Exim test configuration 2115
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2116 b/test/confs/2116
index 14a2d1eed..bf2e5dbae 100644
--- a/test/confs/2116
+++ b/test/confs/2116
@@ -1,6 +1,7 @@
 # Exim test configuration 2116
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/2117 b/test/confs/2117
index 16cc0c39e..f1fe9521b 100644
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2118 b/test/confs/2118
index 362d08704..2da0d464f 100644
--- a/test/confs/2118
+++ b/test/confs/2118
@@ -1,6 +1,7 @@
 # Exim test configuration 2118
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2119 b/test/confs/2119
index 31f143c57..b047c8fb6 100644
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -1,6 +1,7 @@
 # Exim test configuration 2119
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2120 b/test/confs/2120
index 4c9372579..08072f39c 100644
--- a/test/confs/2120
+++ b/test/confs/2120
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
diff --git a/test/confs/2121 b/test/confs/2121
index dbef1b794..7da6b3d96 100644
--- a/test/confs/2121
+++ b/test/confs/2121
@@ -4,6 +4,7 @@ REQUIRE=#
 TRYCLEAR=#
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2122 b/test/confs/2122
index aed0aefb5..701e62f10 100644
--- a/test/confs/2122
+++ b/test/confs/2122
@@ -1,6 +1,7 @@
 # Exim test configuration 2122
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2123 b/test/confs/2123
index 6c4843bf0..99c0c7911 100644
--- a/test/confs/2123
+++ b/test/confs/2123
@@ -1,6 +1,7 @@
 # Exim test configuration 2123
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2124 b/test/confs/2124
index 132c624c6..a250e4a88 100644
--- a/test/confs/2124
+++ b/test/confs/2124
@@ -4,6 +4,7 @@ CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2125 b/test/confs/2125
index 70736be88..20f0caf98 100644
--- a/test/confs/2125
+++ b/test/confs/2125
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2126 b/test/confs/2126
index e2b790168..06f7c21a9 100644
--- a/test/confs/2126
+++ b/test/confs/2126
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2127 b/test/confs/2127
index 3639c5bbf..cfddf9c66 100644
--- a/test/confs/2127
+++ b/test/confs/2127
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2128 b/test/confs/2128
index 296c27c32..3ab9bf536 100644
--- a/test/confs/2128
+++ b/test/confs/2128
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2149 b/test/confs/2149
index 1684f11c6..3c1685f8f 100644
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2150 b/test/confs/2150
index 015947b71..a3391e86b 100644
--- a/test/confs/2150
+++ b/test/confs/2150
@@ -1,6 +1,7 @@
 # Exim test configuration 2150
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2200 b/test/confs/2200
index dc7dbaa18..ee8681cb2 100644
--- a/test/confs/2200
+++ b/test/confs/2200
@@ -1,6 +1,7 @@
 # Exim test configuration 2200
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2201 b/test/confs/2201
index 861db77ba..fd4a4ba71 100644
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -1,6 +1,7 @@
 # Exim test configuration 2201
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2202 b/test/confs/2202
index a00457802..3ed825c1c 100644
--- a/test/confs/2202
+++ b/test/confs/2202
@@ -3,6 +3,7 @@
 CONNECTCOND=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2250 b/test/confs/2250
index 7a38f0b21..de028a38b 100644
--- a/test/confs/2250
+++ b/test/confs/2250
@@ -1,6 +1,7 @@
 # Exim test configuration 2250
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2300 b/test/confs/2300
index d8f6f225d..6b0d3fe2c 100644
--- a/test/confs/2300
+++ b/test/confs/2300
@@ -1,6 +1,7 @@
 # Exim test configuration 2300
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2400 b/test/confs/2400
index 563adba1f..5344f3a1d 100644
--- a/test/confs/2400
+++ b/test/confs/2400
@@ -1,6 +1,7 @@
 # Exim test configuration 2400
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2500 b/test/confs/2500
index b0aa957ae..a0a5aa763 100644
--- a/test/confs/2500
+++ b/test/confs/2500
@@ -1,6 +1,7 @@
 # Exim test configuration 2500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2501 b/test/confs/2501
index 3672b30b6..a2e4ab20e 100644
--- a/test/confs/2501
+++ b/test/confs/2501
@@ -1,6 +1,7 @@
 # Exim test configuration 2501
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/2600 b/test/confs/2600
index 09eedef68..1ed4e8cf8 100644
--- a/test/confs/2600
+++ b/test/confs/2600
@@ -1,6 +1,7 @@
 # Exim test configuration 2600
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3000 b/test/confs/3000
index b8273f190..353a03888 100644
--- a/test/confs/3000
+++ b/test/confs/3000
@@ -1,6 +1,7 @@
 # Exim test configuration 3000
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3100 b/test/confs/3100
index 3d0b17517..279c2bc73 100644
--- a/test/confs/3100
+++ b/test/confs/3100
@@ -1,6 +1,7 @@
 # Exim test configuration 3100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3200 b/test/confs/3200
index 349c7a524..2e73cf627 100644
--- a/test/confs/3200
+++ b/test/confs/3200
@@ -1,6 +1,7 @@
 # Exim test configuration 3200
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3201 b/test/confs/3201
index 6fb89f320..ab6af590a 100644
--- a/test/confs/3201
+++ b/test/confs/3201
@@ -1,6 +1,7 @@
 # Exim test configuration 3201
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3202 b/test/confs/3202
index 97bbfa463..39c6c83be 100644
--- a/test/confs/3202
+++ b/test/confs/3202
@@ -1,6 +1,7 @@
 # Exim test configuration 3202
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3203 b/test/confs/3203
index 1ccaf265f..2eebb7ce8 100644
--- a/test/confs/3203
+++ b/test/confs/3203
@@ -1,6 +1,7 @@
 # Exim test configuration 3203
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3204 b/test/confs/3204
index c4c40d861..fb71e7593 100644
--- a/test/confs/3204
+++ b/test/confs/3204
@@ -1,6 +1,7 @@
 # Exim test configuration 3204
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3205 b/test/confs/3205
index 8b25b3627..55c9d25e6 100644
--- a/test/confs/3205
+++ b/test/confs/3205
@@ -1,6 +1,7 @@
 # Exim test configuration 3205
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3206 b/test/confs/3206
index 4434db155..f6d5f1c32 100644
--- a/test/confs/3206
+++ b/test/confs/3206
@@ -1,6 +1,7 @@
 # Exim test configuration 3206
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3207 b/test/confs/3207
index e9c59ae17..87ff1beb6 100644
--- a/test/confs/3207
+++ b/test/confs/3207
@@ -1,6 +1,7 @@
 # Exim test configuration 3207
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3208 b/test/confs/3208
index 90a85b39d..b53faeb8a 100644
--- a/test/confs/3208
+++ b/test/confs/3208
@@ -1,6 +1,7 @@
 # Exim test configuration 3208
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3209 b/test/confs/3209
index 518ac3931..70d8e102c 100644
--- a/test/confs/3209
+++ b/test/confs/3209
@@ -1,6 +1,7 @@
 # Exim test configuration 3209
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3210 b/test/confs/3210
index 5f399d686..29bc50ff8 100644
--- a/test/confs/3210
+++ b/test/confs/3210
@@ -1,6 +1,7 @@
 # Exim test configuration 3210
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3211 b/test/confs/3211
index a7486df6a..0fca10a8b 100644
--- a/test/confs/3211
+++ b/test/confs/3211
@@ -1,6 +1,7 @@
 # Exim test configuration 3211
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3212 b/test/confs/3212
index 953f2c996..6562dd353 100644
--- a/test/confs/3212
+++ b/test/confs/3212
@@ -1,6 +1,7 @@
 # Exim test configuration 3212
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3213 b/test/confs/3213
index 6fd88679e..45b46916f 100644
--- a/test/confs/3213
+++ b/test/confs/3213
@@ -1,6 +1,7 @@
 # Exim test configuration 3213
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3300 b/test/confs/3300
index b0d54ad16..6ac595d5c 100644
--- a/test/confs/3300
+++ b/test/confs/3300
@@ -1,6 +1,7 @@
 # Exim test configuration 3300
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3400 b/test/confs/3400
index e56756543..ada77e381 100644
--- a/test/confs/3400
+++ b/test/confs/3400
@@ -1,6 +1,7 @@
 # Exim test configuration 3400
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3401 b/test/confs/3401
index 60b1a4624..cb45f192a 100644
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -1,6 +1,7 @@
 # Exim test configuration 3401
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3402 b/test/confs/3402
index cc24582cd..3df870ce2 100644
--- a/test/confs/3402
+++ b/test/confs/3402
@@ -1,6 +1,7 @@
 # Exim test configuration 3402
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3403 b/test/confs/3403
index 6adcf65f3..92f2752b5 100644
--- a/test/confs/3403
+++ b/test/confs/3403
@@ -1,6 +1,7 @@
 # Exim test configuration 3403
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3404 b/test/confs/3404
index dc556e961..26d0f5944 100644
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -1,6 +1,7 @@
 # Exim test configuration 3404
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3405 b/test/confs/3405
index e3141510b..1aecba75c 100644
--- a/test/confs/3405
+++ b/test/confs/3405
@@ -1,6 +1,7 @@
 # Exim test configuration 3405
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3406 b/test/confs/3406
index a6c262e8b..dba613713 100644
--- a/test/confs/3406
+++ b/test/confs/3406
@@ -1,6 +1,7 @@
 # Exim test configuration 3406
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3407 b/test/confs/3407
index 453e3cade..2c9b9242f 100644
--- a/test/confs/3407
+++ b/test/confs/3407
@@ -3,6 +3,7 @@
 OPTION=server_condition = xxx
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/3408 b/test/confs/3408
index 9b90c4bfa..161632632 100644
--- a/test/confs/3408
+++ b/test/confs/3408
@@ -1,6 +1,7 @@
 # Exim test configuration 3408
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/3409 b/test/confs/3409
index a9f35a441..962770d88 100644
--- a/test/confs/3409
+++ b/test/confs/3409
@@ -1,6 +1,7 @@
 # Exim test configuration 3409
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/3410 b/test/confs/3410
index 283a7b297..277355aa9 100644
--- a/test/confs/3410
+++ b/test/confs/3410
@@ -1,6 +1,7 @@
 # Exim test configuration 3410
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3411 b/test/confs/3411
index c2f00db7b..a1c24774f 100644
--- a/test/confs/3411
+++ b/test/confs/3411
@@ -1,6 +1,7 @@
 # Exim test configuration 3411
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3412 b/test/confs/3412
index bd8336e9e..772d59873 100644
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -1,6 +1,7 @@
 # Exim test configuration 3412
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3413 b/test/confs/3413
index 2288119ef..776a2c4ce 100644
--- a/test/confs/3413
+++ b/test/confs/3413
@@ -1,6 +1,7 @@
 # Exim test configuration 3413
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3414 b/test/confs/3414
index 901386899..64952d1b4 100644
--- a/test/confs/3414
+++ b/test/confs/3414
@@ -4,6 +4,7 @@ ACL=
 S=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3415 b/test/confs/3415
index 835484ee6..adf6d5dbd 100644
--- a/test/confs/3415
+++ b/test/confs/3415
@@ -5,6 +5,7 @@ SUBMISSION_OPTIONS=
 AUTH_ID_DOMAIN=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3450 b/test/confs/3450
index 25d00ac1d..bd25c43af 100644
--- a/test/confs/3450
+++ b/test/confs/3450
@@ -1,6 +1,7 @@
 # Exim test configuration 3450
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3451 b/test/confs/3451
index 4f3621b84..2396f8273 100644
--- a/test/confs/3451
+++ b/test/confs/3451
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3452 b/test/confs/3452
index 663be3f35..eeac80343 100644
--- a/test/confs/3452
+++ b/test/confs/3452
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3453 b/test/confs/3453
index 9771050f2..9faf5e72f 100644
--- a/test/confs/3453
+++ b/test/confs/3453
@@ -3,6 +3,7 @@
 REMEMBER=false
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3454 b/test/confs/3454
index 9e059f7ee..621758226 100644
--- a/test/confs/3454
+++ b/test/confs/3454
@@ -1,6 +1,7 @@
 # Exim test configuration 3454
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3455 b/test/confs/3455
index ab26f43cc..4b1846601 100644
--- a/test/confs/3455
+++ b/test/confs/3455
@@ -3,6 +3,7 @@
 HOSTS_AVOID_TLS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3460 b/test/confs/3460
index 496bcd8c2..85ade1f72 100644
--- a/test/confs/3460
+++ b/test/confs/3460
@@ -1,6 +1,7 @@
 # Exim test configuration 3460
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3461 b/test/confs/3461
index 48fe4da3e..a2bc0ac87 100644
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3462 b/test/confs/3462
index ec155bfdd..470815e0b 100644
--- a/test/confs/3462
+++ b/test/confs/3462
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3463 b/test/confs/3463
index d20d1c30b..ba066f0ec 100644
--- a/test/confs/3463
+++ b/test/confs/3463
@@ -3,6 +3,7 @@
 REMEMBER=false
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3464 b/test/confs/3464
index 495d0d99a..d7f6cd7a4 100644
--- a/test/confs/3464
+++ b/test/confs/3464
@@ -1,6 +1,7 @@
 # Exim test configuration 3464
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3465 b/test/confs/3465
index 161fff526..102ad4eee 100644
--- a/test/confs/3465
+++ b/test/confs/3465
@@ -3,6 +3,7 @@
 HOSTS_AVOID_TLS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3500 b/test/confs/3500
index 343a0b3e1..83dc5e630 100644
--- a/test/confs/3500
+++ b/test/confs/3500
@@ -1,6 +1,7 @@
 # Exim test configuration 3500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3501 b/test/confs/3501
index 3f458a1bf..3637c8869 100644
--- a/test/confs/3501
+++ b/test/confs/3501
@@ -1,6 +1,7 @@
 # Exim test configuration 3501
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/3600 b/test/confs/3600
index fca55ff51..0765ba663 100644
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/4000 b/test/confs/4000
index daf5a687e..0c0576329 100644
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,6 +1,7 @@
 # Exim test configuration 4000
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/4100 b/test/confs/4100
index bd6362946..bc218221a 100644
--- a/test/confs/4100
+++ b/test/confs/4100
@@ -1,6 +1,7 @@
 # Exim test configuration 4100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/4950 b/test/confs/4950
index ef5ce9c59..91944c9bd 100644
--- a/test/confs/4950
+++ b/test/confs/4950
@@ -1,6 +1,7 @@
 # Exim test configuration 4950
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5000 b/test/confs/5000
index 67089100f..32f6f38f9 100644
--- a/test/confs/5000
+++ b/test/confs/5000
@@ -1,6 +1,7 @@
 # Exim test configuration 5000
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5001 b/test/confs/5001
index 279bea3d4..1afd5ae6e 100644
--- a/test/confs/5001
+++ b/test/confs/5001
@@ -1,6 +1,7 @@
 # Exim test configuration 5001
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5002 b/test/confs/5002
index 78dd5bbc6..b92f87429 100644
--- a/test/confs/5002
+++ b/test/confs/5002
@@ -1,6 +1,7 @@
 # Exim test configuration 5002
 
 exim_path = EXIM_PATH
+keep_environment =
 primary_hostname = myhost.test.ex
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5003 b/test/confs/5003
index 66cb72b08..07a3b9dcc 100644
--- a/test/confs/5003
+++ b/test/confs/5003
@@ -1,6 +1,7 @@
 # Exim test configuration 5003
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5004 b/test/confs/5004
index c88668c9f..bc4679fdc 100644
--- a/test/confs/5004
+++ b/test/confs/5004
@@ -1,6 +1,7 @@
 # Exim test configuration 5004
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5005 b/test/confs/5005
index 61e22e303..77164a605 100644
--- a/test/confs/5005
+++ b/test/confs/5005
@@ -3,6 +3,7 @@
 QUOTA=500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5006 b/test/confs/5006
index c8cb539fe..abf306ad8 100644
--- a/test/confs/5006
+++ b/test/confs/5006
@@ -1,6 +1,7 @@
 # Exim test configuration 5006
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5007 b/test/confs/5007
index a1ac93e55..95d407e4f 100644
--- a/test/confs/5007
+++ b/test/confs/5007
@@ -3,6 +3,7 @@
 QUOTA=500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5008 b/test/confs/5008
index 9e77ba09e..3995f8c49 100644
--- a/test/confs/5008
+++ b/test/confs/5008
@@ -3,6 +3,7 @@
 QUOTA_FILECOUNT=0
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5009 b/test/confs/5009
index aa87fecd1..f9f414909 100644
--- a/test/confs/5009
+++ b/test/confs/5009
@@ -3,6 +3,7 @@
 SUB=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5050 b/test/confs/5050
index 934cf3db2..2e498a516 100644
--- a/test/confs/5050
+++ b/test/confs/5050
@@ -1,6 +1,7 @@
 # Exim test configuration 5050
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5100 b/test/confs/5100
index 09a3dc891..fb79daa2b 100644
--- a/test/confs/5100
+++ b/test/confs/5100
@@ -3,6 +3,7 @@
 IGNORE_QUOTA=FALSE
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5101 b/test/confs/5101
index 20b3dbb27..cd10fb0c8 100644
--- a/test/confs/5101
+++ b/test/confs/5101
@@ -1,6 +1,7 @@
 # Exim test configuration 5101
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5102 b/test/confs/5102
index 67679fa92..98c10e5fc 100644
--- a/test/confs/5102
+++ b/test/confs/5102
@@ -1,6 +1,7 @@
 # Exim test configuration 5102
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5103 b/test/confs/5103
index 32370a766..1f64ce6d3 100644
--- a/test/confs/5103
+++ b/test/confs/5103
@@ -1,6 +1,7 @@
 # Exim test configuration 5103
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5200 b/test/confs/5200
index 415d2f9a7..2b3650e36 100644
--- a/test/confs/5200
+++ b/test/confs/5200
@@ -1,6 +1,7 @@
 # Exim test configuration 5200
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5201 b/test/confs/5201
index 7de922887..4680fa13d 100644
--- a/test/confs/5201
+++ b/test/confs/5201
@@ -1,6 +1,7 @@
 # Exim test configuration 5201
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5202 b/test/confs/5202
index 33a6f593b..087c8b071 100644
--- a/test/confs/5202
+++ b/test/confs/5202
@@ -1,6 +1,7 @@
 # Exim test configuration 5202
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5203 b/test/confs/5203
index aeb5e0b10..7533c627e 100644
--- a/test/confs/5203
+++ b/test/confs/5203
@@ -1,6 +1,7 @@
 # Exim test configuration 5203
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5204 b/test/confs/5204
index 5846f5b11..c0eaf1779 100644
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -3,6 +3,7 @@
 COMMAND_USER=EXIMUSER
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5205 b/test/confs/5205
index fbbed48cf..2ae50434a 100644
--- a/test/confs/5205
+++ b/test/confs/5205
@@ -1,6 +1,7 @@
 # Exim test configuration 5205
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5206 b/test/confs/5206
index d0a3abf9a..82e2e6812 100644
--- a/test/confs/5206
+++ b/test/confs/5206
@@ -1,6 +1,7 @@
 # Exim test configuration 5206
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/5207 b/test/confs/5207
index 73e5ee499..747c54dad 100644
--- a/test/confs/5207
+++ b/test/confs/5207
@@ -1,6 +1,7 @@
 # Exim test configuration 5207
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5208 b/test/confs/5208
index 4f6a981b2..ab6ca91ac 100644
--- a/test/confs/5208
+++ b/test/confs/5208
@@ -4,6 +4,7 @@ LIST=
 SELF=freeze
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5209 b/test/confs/5209
index fb1da45e0..5cbff0110 100644
--- a/test/confs/5209
+++ b/test/confs/5209
@@ -1,6 +1,7 @@
 # Exim test configuration 5209
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5300 b/test/confs/5300
index 6865447e6..3446b253b 100644
--- a/test/confs/5300
+++ b/test/confs/5300
@@ -3,6 +3,7 @@
 ALLOW=true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5301 b/test/confs/5301
index 115604f49..0c8cff047 100644
--- a/test/confs/5301
+++ b/test/confs/5301
@@ -3,6 +3,7 @@
 D6=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5400 b/test/confs/5400
index 8f2e8b585..7d3f2c8b2 100644
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -1,6 +1,7 @@
 # Exim test configuration 5400
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5401 b/test/confs/5401
index db018a6d4..023174218 100644
--- a/test/confs/5401
+++ b/test/confs/5401
@@ -1,6 +1,7 @@
 # Exim test configuration 5401
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5410 b/test/confs/5410
index 576967cac..ee828430d 100644
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -1,6 +1,7 @@
 # Exim test configuration 5410
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5420 b/test/confs/5420
index 2a7ebda1b..ffeae26a1 100644
--- a/test/confs/5420
+++ b/test/confs/5420
@@ -1,6 +1,7 @@
 # Exim test configuration 5420
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5500 b/test/confs/5500
index 1bc830ef4..1420e20bd 100644
--- a/test/confs/5500
+++ b/test/confs/5500
@@ -4,6 +4,7 @@
 LOG_SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5510 b/test/confs/5510
index 48724213b..74b755b4f 100644
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -4,6 +4,7 @@
 LOG_SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5600 b/test/confs/5600
index 8b26ee7fa..44c03197b 100644
--- a/test/confs/5600
+++ b/test/confs/5600
@@ -4,6 +4,7 @@
 CRL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5601 b/test/confs/5601
index 5172ff279..7b3df71f1 100644
--- a/test/confs/5601
+++ b/test/confs/5601
@@ -4,6 +4,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment  = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 rfc1413_query_timeout = 0s
diff --git a/test/confs/5700 b/test/confs/5700
index 52b28018a..c0f42d492 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -1,6 +1,7 @@
 # Exim test configuration 5700
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/9000 b/test/confs/9000
index 8f48594fe..e44e41dfd 100644
--- a/test/confs/9000
+++ b/test/confs/9000
@@ -3,6 +3,7 @@
 LDAPSERVERS=
 
 exim_path = EXIM_PATH
+keep_environment = LDAPTLS_REQCERT
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9001 b/test/confs/9001
index b4177159c..581984f68 100644
--- a/test/confs/9001
+++ b/test/confs/9001
@@ -1,6 +1,7 @@
 # Exim test configuration 9001
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9100 b/test/confs/9100
index a36b30bc8..752f8b540 100644
--- a/test/confs/9100
+++ b/test/confs/9100
@@ -1,6 +1,7 @@
 # Exim test configuration 9100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9200 b/test/confs/9200
index 022e589d9..e1293b481 100644
--- a/test/confs/9200
+++ b/test/confs/9200
@@ -3,6 +3,7 @@
 SERVERS=localhost/test/ph10/
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9300 b/test/confs/9300
index 91365047f..e583ef494 100644
--- a/test/confs/9300
+++ b/test/confs/9300
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9350 b/test/confs/9350
index 4ba8e6d68..dcc0baf44 100644
--- a/test/confs/9350
+++ b/test/confs/9350
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9400 b/test/confs/9400
index 3f7dbe932..b303c6ba0 100644
--- a/test/confs/9400
+++ b/test/confs/9400
@@ -1,6 +1,7 @@
 # Exim test configuration 9400
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9401 b/test/confs/9401
index 34f7aad40..9976ae107 100644
--- a/test/confs/9401
+++ b/test/confs/9401
@@ -1,6 +1,7 @@
 # Exim test configuration 9401
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/9402 b/test/confs/9402
index 6eb8db5e5..a56b9a3fe 100644
--- a/test/confs/9402
+++ b/test/confs/9402
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9450 b/test/confs/9450
index ea5f703aa..569c2962e 100644
--- a/test/confs/9450
+++ b/test/confs/9450
@@ -1,6 +1,7 @@
 # Exim test configuration 9450
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9900 b/test/confs/9900
index 2a69d0115..11d293ba9 100644
--- a/test/confs/9900
+++ b/test/confs/9900
@@ -1,6 +1,7 @@
 # Exim test configuration 1006
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/9901 b/test/confs/9901
index 86f70033b..59d9bec33 100644
--- a/test/confs/9901
+++ b/test/confs/9901
@@ -4,6 +4,7 @@ COM=
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/9902 b/test/confs/9902
index 730d633fb..a19794acb 100644
--- a/test/confs/9902
+++ b/test/confs/9902
@@ -5,6 +5,7 @@
 ORDER=
 
 exim_path = EXIM_PATH
+keep_environment =
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/confs/9903 b/test/confs/9903
index c126b899b..ba385efba 100644
--- a/test/confs/9903
+++ b/test/confs/9903
@@ -1,6 +1,7 @@
 # Exim test configuration 9903
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
diff --git a/test/paniclog/0013 b/test/paniclog/0013
index 78e7e579a..74c607a1b 100644
--- a/test/paniclog/0013
+++ b/test/paniclog/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
   extra characters follow string value for relay_hosts
diff --git a/test/paniclog/0148 b/test/paniclog/0148
index bf2bfc0b3..d9985aabd 100644
--- a/test/paniclog/0148
+++ b/test/paniclog/0148
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 17 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
   missing quote at end of string value for hold_domains
diff --git a/test/paniclog/0236 b/test/paniclog/0236
index 66533fed4..6b472bcd8 100644
--- a/test/paniclog/0236
+++ b/test/paniclog/0236
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
   macro name too long (maximum is 63 characters)
diff --git a/test/paniclog/0290 b/test/paniclog/0290
index 24b6854cc..40585c690 100644
--- a/test/paniclog/0290
+++ b/test/paniclog/0290
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 27 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 28 of TESTSUITE/test-config:
   .include specifies a non-absolute path "non/absolute"
diff --git a/test/paniclog/0348 b/test/paniclog/0348
index d2c59c2ad..d18082f4c 100644
--- a/test/paniclog/0348
+++ b/test/paniclog/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
diff --git a/test/paniclog/0415 b/test/paniclog/0415
index bedff5d78..4e5fcc9c6 100644
--- a/test/paniclog/0415
+++ b/test/paniclog/0415
@@ -1,20 +1,20 @@
-1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
   absolute value of integer "4000000M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
-  extra characters follow integer value for check_spool_space
 1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+  extra characters follow integer value for check_spool_space
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
   integer "4000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999999999999999" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999999K" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   integer expected for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
diff --git a/test/paniclog/0442 b/test/paniclog/0442
index 6db126e5a..f8afd85ea 100644
--- a/test/paniclog/0442
+++ b/test/paniclog/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config:
   failed to open included configuration file /non/existent
diff --git a/test/runtest b/test/runtest
index 443d7fcf4..af04b9c53 100755
--- a/test/runtest
+++ b/test/runtest
@@ -339,7 +339,7 @@ $spid = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
 # that are specific to certain file types, though there are also some of those
 # inline too.
 
-while(<IN>)
+LINE: while(<IN>)
   {
 RESET_AFTER_EXTRA_LINE_READ:
   # Custom munges
@@ -527,6 +527,25 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/TLS1.[012]:(DHE_)?RSA_AES_256_CBC_SHA(1|256):256/TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256/g;
   s/\bDHE-RSA-AES256-SHA256\b/DHE-RSA-AES256-SHA/g;
 
+  # -d produces a list of environement variables as they are checked if they exist in the
+  # in the environment. Unfortunately this list isn't always in the same order. For now we
+  # just remove this list
+  #
+  if (/^\w+ in keep_environment/)
+    {
+    my @lines = $_;
+    while (<IN>)
+      {
+      if (/^\w+ in keep_environment/)
+        {
+        push @lines, $_;
+        next;
+        }
+      print MUNGED sort grep { !/^(SHLVL|_) / } @lines;
+      redo LINE;
+      }
+    }
+
 
   # ======== Caller's login, uid, gid, home, gecos ========
 
@@ -1538,6 +1557,8 @@ my($commandnameref) = $_[3];
 my($aux_info) = $_[4];
 my($yield) = 1;
 
+our %ENV = map { $_ => $ENV{$_} } grep { /^(?:USER|SHELL|PATH|TERM|EXIM_TEST_.*)$/ } keys %ENV;
+
 if (/^(\d+)\s*$/)                # Handle unusual return code
   {
   my($r) = $_[2];
@@ -1918,12 +1939,12 @@ if (/^client/ || /^(sudo\s+)?perl\b/)
 # not drop privilege when -C and -D options are present. To run the exim
 # command as root, we use sudo.
 
-elsif (/^([A-Z_]+=\S+\s+)?(\d+)?\s*(sudo\s+)?exim(_\S+)?\s+(.*)$/)
+elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+)?\s+(.*)$/)
   {
-  $args = $5;
+  $args = $6;
   my($envset) = (defined $1)? $1      : "";
-  my($sudo)   = (defined $3)? "sudo " : "";
-  my($special)= (defined $4)? $4      : "";
+  my($sudo)   = (defined $3)? "sudo " . (defined $4 ? "-u $4 ":"")  : "";
+  my($special)= (defined $5)? $5      : "";
   $wait_time  = (defined $2)? $2      : 0;
 
   # Return 2 rather than 1 afterwards
diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615
new file mode 100644
index 000000000..9057363f3
--- /dev/null
+++ b/test/scripts/0000-Basic/0615
@@ -0,0 +1,13 @@
+# Environment
+# settings
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP keep_environment add_environment
+****
+# result via -bP enviroment
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP environment
+****
+# result via -n -bP enviroment
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -n -bP environment
+****
+# result via perl_at_start
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -ps -be ''
+***
diff --git a/test/scripts/0000-Basic/0616 b/test/scripts/0000-Basic/0616
new file mode 120000
index 000000000..122707d0a
--- /dev/null
+++ b/test/scripts/0000-Basic/0616
@@ -0,0 +1 @@
+0615
\ No newline at end of file
diff --git a/test/stderr/0002 b/test/stderr/0002
index 7a6632bfe..7c79bbf96 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -133,6 +133,11 @@ expanding: -oMt  sender_ident = $sender_ident
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+PATH in keep_environment? no (end of list)
+PWD in keep_environment? no (end of list)
+SHELL in keep_environment? no (end of list)
+TERM in keep_environment? no (end of list)
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -193,6 +198,11 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+PATH in keep_environment? no (end of list)
+PWD in keep_environment? no (end of list)
+SHELL in keep_environment? no (end of list)
+TERM in keep_environment? no (end of list)
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -353,6 +363,11 @@ LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=pppp
+PATH in keep_environment? no (end of list)
+PWD in keep_environment? no (end of list)
+SHELL in keep_environment? no (end of list)
+TERM in keep_environment? no (end of list)
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git a/test/stderr/0013 b/test/stderr/0013
index 78e7e579a..74c607a1b 100644
--- a/test/stderr/0013
+++ b/test/stderr/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
   extra characters follow string value for relay_hosts
diff --git a/test/stderr/0148 b/test/stderr/0148
index 1b5b73a21..f7153995d 100644
--- a/test/stderr/0148
+++ b/test/stderr/0148
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 17 of TESTSUITE/test-config:
+  Exim configuration error in line 18 of TESTSUITE/test-config:
   missing quote at end of string value for hold_domains
diff --git a/test/stderr/0236 b/test/stderr/0236
index 193370cc8..75ed334bf 100644
--- a/test/stderr/0236
+++ b/test/stderr/0236
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 15 of TESTSUITE/test-config:
+  Exim configuration error in line 16 of TESTSUITE/test-config:
   macro name too long (maximum is 63 characters)
diff --git a/test/stderr/0290 b/test/stderr/0290
index cd1712e9f..729780b71 100644
--- a/test/stderr/0290
+++ b/test/stderr/0290
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 27 of TESTSUITE/test-config:
+  Exim configuration error in line 28 of TESTSUITE/test-config:
   .include specifies a non-absolute path "non/absolute"
diff --git a/test/stderr/0348 b/test/stderr/0348
index d2c59c2ad..d18082f4c 100644
--- a/test/stderr/0348
+++ b/test/stderr/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
diff --git a/test/stderr/0415 b/test/stderr/0415
index 062b67be5..95b5e7f5e 100644
--- a/test/stderr/0415
+++ b/test/stderr/0415
@@ -1,30 +1,30 @@
 LOG: PANIC DIE
-  Exim configuration error in line 20 of TESTSUITE/test-config:
+  Exim configuration error in line 21 of TESTSUITE/test-config:
   absolute value of integer "4000000M" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 20 of TESTSUITE/test-config:
+  Exim configuration error in line 21 of TESTSUITE/test-config:
   extra characters follow integer value for check_spool_space
 LOG: PANIC DIE
-  Exim configuration error in line 21 of TESTSUITE/test-config:
+  Exim configuration error in line 22 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 21 of TESTSUITE/test-config:
+  Exim configuration error in line 22 of TESTSUITE/test-config:
   integer "4000000.123" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999999999999999" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999999K" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999M" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   integer expected for finduser_retries
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
diff --git a/test/stderr/0442 b/test/stderr/0442
index 6db126e5a..f8afd85ea 100644
--- a/test/stderr/0442
+++ b/test/stderr/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config:
   failed to open included configuration file /non/existent
diff --git a/test/stderr/0615 b/test/stderr/0615
new file mode 100644
index 000000000..85ee6f760
--- /dev/null
+++ b/test/stderr/0615
@@ -0,0 +1,15 @@
+LOG: MAIN
+  WARNING: purging the environment.
+ Suggested action: use keep_environment and add_environment.
+
+LOG: MAIN
+  WARNING: purging the environment.
+ Suggested action: use keep_environment and add_environment.
+
+LOG: MAIN
+  WARNING: purging the environment.
+ Suggested action: use keep_environment and add_environment.
+
+1999-03-02 09:44:33 WARNING: purging the environment.
+ Suggested action: use keep_environment and add_environment.
+
diff --git a/test/stdout/0615 b/test/stdout/0615
new file mode 100644
index 000000000..58d5d0e37
--- /dev/null
+++ b/test/stdout/0615
@@ -0,0 +1,4 @@
+keep_environment = 
+add_environment = 
+Environment visible in Perl:
+
diff --git a/test/stdout/0616 b/test/stdout/0616
new file mode 100644
index 000000000..8ba67bb34
--- /dev/null
+++ b/test/stdout/0616
@@ -0,0 +1,19 @@
+keep_environment = ^FOO\d : BAR
+add_environment = ADDED1=added1 : ADDED2=added2
+ADDED1=added1
+ADDED2=added2
+BAR=bar
+FOO1=foo1
+FOO2=foo2
+ADDED1
+ADDED2
+BAR
+FOO1
+FOO2
+Environment visible in Perl:
+ADDED1=added1
+ADDED2=added2
+BAR=bar
+FOO1=foo1
+FOO2=foo2
+