Merge from master into 4.next

Done with git merge --squash -x theirs master
author: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> 2016-11-25 11:23:26 +0100
committer: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> 2016-11-25 11:25:08 +0100
commit: 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch)
tree: 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/confs
parent: 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff)
846 files changed, 2637 insertions, 5609 deletions
diff --git a/test/confs/0000 b/test/confs/0000
index a0c5072d6..12c91fda1 100644
--- a/test/confs/0000
+++ b/test/confs/0000
@@ -3,11 +3,11 @@
 # 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
 tls_advertise_hosts =
+keep_environment =
 
 # End
diff --git a/test/confs/0001 b/test/confs/0001
index 5350ba463..b0f8f61e3 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
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
@@ -147,7 +148,7 @@ no_queue_only_override
 queue_only_file = /var/spool/exim/queue_only
 queue_only_load = 8.2
 no_queue_run_in_order
-queue_run_max = 5
+queue_run_max = ${if = {1}{1} {5}{10}}
 queue_smtp_domains = x.y.z
 receive_timeout = 0s
 received_header_text = Received: ${if def:sender_rcvhost {from ${sender_rcvhost}\n\t}{${if def:sender_ident {from ${sender_ident} }}${if def:sender_helo_name {(helo=${sender_helo_name})\n\t}}}}by ${primary_hostname} ${if def:received_protocol {with ${received_protocol}}} (Exim ${version_number} #${compile_number})\n\tid ${message_id}${if def:received_for {\n\tfor $received_for}}
@@ -192,12 +193,13 @@ no_strip_excess_angle_brackets
 no_strip_trailing_dot
 no_syslog_duplication
 syslog_facility = uucp
+no_syslog_pid
 syslog_processname = mta-exim
 no_syslog_timestamp
 system_filter = /home/exim/test/filter
 system_filter_directory_transport =
 system_filter_file_transport =
-system_filter_group = mail
+system_filter_group = MAILGROUP
 system_filter_pipe_transport =
 system_filter_reply_transport =
 system_filter_user = 99
@@ -235,7 +237,7 @@ manualroute:
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts = localhost
-  group = mail
+  group = MAILGROUP
   headers_add =
   headers_remove =
   host_find_failed = freeze
@@ -369,7 +371,7 @@ forward:
   forbid_filter_run
   no_forbid_include
   no_forbid_pipe
-  group = mail
+  group = MAILGROUP
   headers_add =
   headers_remove =
   hide_child_in_errmsg
@@ -385,7 +387,7 @@ forward:
   more
   no_one_time
   owners = root
-  owngroups = mail
+  owngroups = MAILGROUP
   pipe_transport = dummy
   no_qualify_preserve_domain
   redirect_router = aliasfile2
@@ -419,7 +421,7 @@ localuser:
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts =
-  group = mail
+  group = MAILGROUP
   headers_add = X-added: by localuser
   headers_remove =
   no_initgroups
@@ -459,7 +461,7 @@ smartuser:
   file_transport = dummy
   forbid_file
   forbid_pipe
-  group = mail
+  group = MAILGROUP
   headers_add =
   headers_remove =
   hide_child_in_errmsg
@@ -518,7 +520,7 @@ appendfile:
   file = /home/$local_part/inbox
   file_format = "From : appendfile"
   no_file_must_exist
-  group = mail
+  group = MAILGROUP
   headers_add = X-original-domain: $original_domain\nX-original-localp: $original_local_part
   headers_remove =
   headers_rewrite = a@b c@d
@@ -529,7 +531,7 @@ appendfile:
   lockfile_timeout = 30m
   mailbox_size = 1000
   mailbox_filecount = 9999
-  message_size_limit = 1M
+  message_size_limit = 1G
   mode = 0600
   mode_fail_narrower
   no_notify_comsat
diff --git a/test/confs/0002 b/test/confs/0002
index 0616f5ecf..6ca2d1bcb 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
 spool_directory = DIR/spool
diff --git a/test/confs/0003 b/test/confs/0003
index 0c95732cc..af93db7c6 100644
--- a/test/confs/0003
+++ b/test/confs/0003
@@ -1,12 +1,7 @@
 # Exim test configuration 0003
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 acl_smtp_rcpt = check_recipient
 domainlist local_domains = test.ex
diff --git a/test/confs/0004 b/test/confs/0004
index 8faf1c60a..8ebec4d98 100644
--- a/test/confs/0004
+++ b/test/confs/0004
@@ -1,12 +1,7 @@
 # Exim test configuration 0004
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 acl_smtp_rcpt = check_recipient
 domainlist local_domains = test.ex
diff --git a/test/confs/0005 b/test/confs/0005
index de20203a3..7c0689c16 100644
--- a/test/confs/0005
+++ b/test/confs/0005
@@ -1,12 +1,7 @@
 # Exim test configuration 0005
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0006 b/test/confs/0006
index 597c6bafb..c01a2fe2e 100644
--- a/test/confs/0006
+++ b/test/confs/0006
@@ -1,12 +1,7 @@
 # Exim test configuration 0006
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0007 b/test/confs/0007
index e31fd4c5c..05631cc39 100644
--- a/test/confs/0007
+++ b/test/confs/0007
@@ -1,12 +1,7 @@
 # Exim test configuration 0007
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0008 b/test/confs/0008
index 1a3ce395f..91db09111 100644
--- a/test/confs/0008
+++ b/test/confs/0008
@@ -1,12 +1,7 @@
 # Exim test configuration 0008
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0009 b/test/confs/0009
index ce366fd38..422fe3d1d 100644
--- a/test/confs/0009
+++ b/test/confs/0009
@@ -1,12 +1,7 @@
 # Exim test configuration 0009
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0010 b/test/confs/0010
index 074928a87..39e3fcf88 100644
--- a/test/confs/0010
+++ b/test/confs/0010
@@ -1,12 +1,7 @@
 # Exim test configuration 0010
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0011 b/test/confs/0011
index 53864399f..f8c04763d 100644
--- a/test/confs/0011
+++ b/test/confs/0011
@@ -1,12 +1,7 @@
 # Exim test configuration 0011
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0012 b/test/confs/0012
index 7b07d27fc..b367e8992 100644
--- a/test/confs/0012
+++ b/test/confs/0012
@@ -1,12 +1,7 @@
 # Exim test configuration 0012
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0013 b/test/confs/0013
index bc266e5fd..1b2cec88f 100644
--- a/test/confs/0013
+++ b/test/confs/0013
@@ -1,14 +1,9 @@
 # Exim test configuration 0013
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0014 b/test/confs/0014
index da0abb449..1fdd92d0c 100644
--- a/test/confs/0014
+++ b/test/confs/0014
@@ -1,13 +1,8 @@
 # Exim test configuration 0014
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0015 b/test/confs/0015
index 04dc46cf2..c6fccd316 100644
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -1,12 +1,7 @@
 # Exim test configuration 0015
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0016 b/test/confs/0016
index d68778639..4260c88be 100644
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -1,12 +1,7 @@
 # Exim test configuration 0016
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0017 b/test/confs/0017
index c1b94ccd0..74585c689 100644
--- a/test/confs/0017
+++ b/test/confs/0017
@@ -1,12 +1,7 @@
 # Exim test configuration 0017
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0018 b/test/confs/0018
index 1eb1b08f7..4b85cf3d3 100644
--- a/test/confs/0018
+++ b/test/confs/0018
@@ -1,12 +1,7 @@
 # Exim test configuration 0018
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0019 b/test/confs/0019
index 2ca5d5893..dbb303b6e 100644
--- a/test/confs/0019
+++ b/test/confs/0019
@@ -1,12 +1,7 @@
-# Exim test configuration 2409
+# Exim test configuration 0019
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0020 b/test/confs/0020
index 1182e6a84..ce48c884c 100644
--- a/test/confs/0020
+++ b/test/confs/0020
@@ -1,13 +1,8 @@
 # Exim test configuration 0020
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0021 b/test/confs/0021
index 31cf2c670..ae5a309b9 100644
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -2,15 +2,11 @@
 
 SERVER=
 BR=
+LOG_SELECTOR=
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -26,6 +22,7 @@ acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 
 BR
+log_selector = LOG_SELECTOR
 
 qualify_domain = test.ex
 trusted_users = CALLER
diff --git a/test/confs/0022 b/test/confs/0022
index e2ebe66f9..bd04442aa 100644
--- a/test/confs/0022
+++ b/test/confs/0022
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0023 b/test/confs/0023
index 0883bffa4..2481976ce 100644
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -2,14 +2,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0024 b/test/confs/0024
index 0d5578423..3dbbc2c25 100644
--- a/test/confs/0024
+++ b/test/confs/0024
@@ -1,13 +1,8 @@
 # Exim test configuration 0024
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0025 b/test/confs/0025
index a655d5f88..3ecc5dd68 100644
--- a/test/confs/0025
+++ b/test/confs/0025
@@ -1,13 +1,8 @@
 # Exim test configuration 0025
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0026 b/test/confs/0026
index f40587980..07fa40976 100644
--- a/test/confs/0026
+++ b/test/confs/0026
@@ -1,13 +1,8 @@
 # Exim test configuration 0026
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0027 b/test/confs/0027
index b508a5b65..9c775bd5d 100644
--- a/test/confs/0027
+++ b/test/confs/0027
@@ -1,13 +1,8 @@
 # Exim test configuration 0027
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0028 b/test/confs/0028
index cc0784b06..149d8eda8 100644
--- a/test/confs/0028
+++ b/test/confs/0028
@@ -1,13 +1,8 @@
 # Exim test configuration 0028
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0029 b/test/confs/0029
index a4eb1b1db..09e77963f 100644
--- a/test/confs/0029
+++ b/test/confs/0029
@@ -1,13 +1,8 @@
 # Exim test configuration 0029
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0030 b/test/confs/0030
index c7c5f0867..446a7ede8 100644
--- a/test/confs/0030
+++ b/test/confs/0030
@@ -1,13 +1,8 @@
 # Exim test configuration 0030
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0031 b/test/confs/0031
index 0328320ca..e3f0360fc 100644
--- a/test/confs/0031
+++ b/test/confs/0031
@@ -1,13 +1,8 @@
 # Exim test configuration 0031
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0032 b/test/confs/0032
index 1648fd217..961cefadd 100644
--- a/test/confs/0032
+++ b/test/confs/0032
@@ -1,13 +1,8 @@
 # Exim test configuration 0032
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0033 b/test/confs/0033
index 9e95388c3..ca06da772 100644
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -1,13 +1,8 @@
 # Exim test configuration 0033
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0034 b/test/confs/0034
index e5f7931c3..8eb9dce69 100644
--- a/test/confs/0034
+++ b/test/confs/0034
@@ -1,13 +1,8 @@
 # Exim test configuration 0034
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0035 b/test/confs/0035
index 36ad12a83..8d34269a2 100644
--- a/test/confs/0035
+++ b/test/confs/0035
@@ -3,14 +3,9 @@
 SERVER=
 SUBMISSION_OPTIONS=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0036 b/test/confs/0036
index 0c5044445..48479c787 100644
--- a/test/confs/0036
+++ b/test/confs/0036
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0037 b/test/confs/0037
index 98ef4d3d4..8ba94ded1 100644
--- a/test/confs/0037
+++ b/test/confs/0037
@@ -2,13 +2,8 @@
 
 FILTER_PREPEND_HOME=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0038 b/test/confs/0038
index 514af9e8a..0ef9028f1 100644
--- a/test/confs/0038
+++ b/test/confs/0038
@@ -4,14 +4,9 @@ RRATELIMIT=0/1h/strict
 DRATELIMIT=0/1h/per_byte/strict
 ACLRCPT=check_rcpt
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0039 b/test/confs/0039
index f8ad999f5..8ca8b1eec 100644
--- a/test/confs/0039
+++ b/test/confs/0039
@@ -2,14 +2,9 @@
 
 QDG=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0040 b/test/confs/0040
index 71f903845..35453a0dd 100644
--- a/test/confs/0040
+++ b/test/confs/0040
@@ -1,12 +1,7 @@
 # Exim test configuration 0040
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0041 b/test/confs/0041
index ec1067584..5157170f2 100644
--- a/test/confs/0041
+++ b/test/confs/0041
@@ -1,12 +1,7 @@
 # Exim test configuration 0041
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0042 b/test/confs/0042
index c65be6f99..14c8a9635 100644
--- a/test/confs/0042
+++ b/test/confs/0042
@@ -1,12 +1,7 @@
 # Exim test configuration 0042
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0043 b/test/confs/0043
index eaa13a859..0bf3547c7 100644
--- a/test/confs/0043
+++ b/test/confs/0043
@@ -1,12 +1,7 @@
 # Exim test configuration 0043
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0044 b/test/confs/0044
index 963a55ea3..e4db43db0 100644
--- a/test/confs/0044
+++ b/test/confs/0044
@@ -1,12 +1,7 @@
 # Exim test configuration 0044
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0045 b/test/confs/0045
index 764a7f213..a59c8e2c1 100644
--- a/test/confs/0045
+++ b/test/confs/0045
@@ -1,12 +1,7 @@
 # Exim test configuration 0045
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0046 b/test/confs/0046
index a64d3d9ea..9fff3b91b 100644
--- a/test/confs/0046
+++ b/test/confs/0046
@@ -2,13 +2,8 @@
 
 NL=FALSE
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0047 b/test/confs/0047
index ff8aea173..187f855ef 100644
--- a/test/confs/0047
+++ b/test/confs/0047
@@ -1,12 +1,7 @@
 # Exim test configuration 0047
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0048 b/test/confs/0048
index c15945f98..9c2d4428f 100644
--- a/test/confs/0048
+++ b/test/confs/0048
@@ -2,13 +2,8 @@
 
 MESSAGE_LOGS = true
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0049 b/test/confs/0049
index 4dc39d87b..a00dde1f5 100644
--- a/test/confs/0049
+++ b/test/confs/0049
@@ -1,13 +1,8 @@
 # Exim test configuration 0049
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0050 b/test/confs/0050
index 47869246c..32a822a9b 100644
--- a/test/confs/0050
+++ b/test/confs/0050
@@ -1,14 +1,9 @@
 # Exim test configuration 0050
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0051 b/test/confs/0051
index af1e10acd..2fde9e557 100644
--- a/test/confs/0051
+++ b/test/confs/0051
@@ -1,14 +1,9 @@
 # Exim test configuration 0051
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0052 b/test/confs/0052
index 3b36daf04..2af555cca 100644
--- a/test/confs/0052
+++ b/test/confs/0052
@@ -1,14 +1,9 @@
 # Exim test configuration 0052
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0053 b/test/confs/0053
index 0e6a98546..04263a59f 100644
--- a/test/confs/0053
+++ b/test/confs/0053
@@ -1,14 +1,9 @@
 # Exim test configuration 0053
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0054 b/test/confs/0054
index 13ca588a4..3ad875157 100644
--- a/test/confs/0054
+++ b/test/confs/0054
@@ -1,14 +1,9 @@
 # Exim test configuration 0054
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0055 b/test/confs/0055
index 0c64561b3..72a2be740 100644
--- a/test/confs/0055
+++ b/test/confs/0055
@@ -1,13 +1,8 @@
 # Exim test configuration 0055
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0056 b/test/confs/0056
index cc151dd70..1678e2063 100644
--- a/test/confs/0056
+++ b/test/confs/0056
@@ -1,13 +1,8 @@
 # Exim test configuration 0056
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0057 b/test/confs/0057
index 2b13c187d..db09830ad 100644
--- a/test/confs/0057
+++ b/test/confs/0057
@@ -1,13 +1,8 @@
 # Exim test configuration 0057
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0058 b/test/confs/0058
index 4c3472379..2b52453a0 100644
--- a/test/confs/0058
+++ b/test/confs/0058
@@ -1,13 +1,8 @@
 # Exim test configuration 0058
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0059 b/test/confs/0059
index 6c771f1d2..40e877be8 100644
--- a/test/confs/0059
+++ b/test/confs/0059
@@ -1,13 +1,8 @@
 # Exim test configuration 0059
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0060 b/test/confs/0060
index c17f00372..6ff220906 100644
--- a/test/confs/0060
+++ b/test/confs/0060
@@ -1,13 +1,8 @@
 # Exim test configuration 0060
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0061 b/test/confs/0061
index 5f8521499..07c85e4a9 100644
--- a/test/confs/0061
+++ b/test/confs/0061
@@ -1,13 +1,8 @@
 # Exim test configuration 0061
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = ten-1.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0062 b/test/confs/0062
index 3e3ee757d..b5d47c862 100644
--- a/test/confs/0062
+++ b/test/confs/0062
@@ -1,13 +1,8 @@
 # Exim test configuration 0062
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0063 b/test/confs/0063
index e832aa81a..b297ec011 100644
--- a/test/confs/0063
+++ b/test/confs/0063
@@ -1,13 +1,8 @@
 # Exim test configuration 0063
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0064 b/test/confs/0064
index 5046f2375..f0d9e9618 100644
--- a/test/confs/0064
+++ b/test/confs/0064
@@ -1,13 +1,8 @@
 # Exim test configuration 0064
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0065 b/test/confs/0065
index 47b90b199..fb01f3772 100644
--- a/test/confs/0065
+++ b/test/confs/0065
@@ -1,13 +1,8 @@
 # Exim test configuration 0065
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0066 b/test/confs/0066
index 6271d5a0d..dcf3bcffc 100644
--- a/test/confs/0066
+++ b/test/confs/0066
@@ -1,13 +1,8 @@
 # Exim test configuration 0066
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0067 b/test/confs/0067
index de9a0db9c..35bd3b24c 100644
--- a/test/confs/0067
+++ b/test/confs/0067
@@ -1,13 +1,8 @@
 # Exim test configuration 0067
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0068 b/test/confs/0068
index f4239beea..f8078fdf3 100644
--- a/test/confs/0068
+++ b/test/confs/0068
@@ -1,12 +1,7 @@
 # Exim test configuration 0068
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0069 b/test/confs/0069
index 3514a1ea1..ca81da915 100644
--- a/test/confs/0069
+++ b/test/confs/0069
@@ -2,14 +2,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0070 b/test/confs/0070
index 1c439b72b..9ef3b2ad8 100644
--- a/test/confs/0070
+++ b/test/confs/0070
@@ -2,14 +2,9 @@
 
 HVH=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0071 b/test/confs/0071
index 00d45578a..d7ab2ff5d 100644
--- a/test/confs/0071
+++ b/test/confs/0071
@@ -1,12 +1,7 @@
 # Exim test configuration 0071
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0072 b/test/confs/0072
index 69ad904cd..9bb73984d 100644
--- a/test/confs/0072
+++ b/test/confs/0072
@@ -4,13 +4,8 @@ ONCE=once=DIR/spool/autolog
 ONLY=
 RETURN=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0073 b/test/confs/0073
index dfea2c293..da716efb6 100644
--- a/test/confs/0073
+++ b/test/confs/0073
@@ -1,12 +1,7 @@
 # Exim test configuration 0073
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0074 b/test/confs/0074
index c967ba27c..3102206b0 100644
--- a/test/confs/0074
+++ b/test/confs/0074
@@ -1,12 +1,7 @@
 # Exim test configuration 0074
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0075 b/test/confs/0075
index e4a6fdfca..8b8c77ca6 100644
--- a/test/confs/0075
+++ b/test/confs/0075
@@ -1,12 +1,7 @@
 # Exim test configuration 0075
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0076 b/test/confs/0076
index 840fde7e3..1415280f9 100644
--- a/test/confs/0076
+++ b/test/confs/0076
@@ -1,12 +1,7 @@
 # Exim test configuration 0076
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0077 b/test/confs/0077
index 18edff925..564554e39 100644
--- a/test/confs/0077
+++ b/test/confs/0077
@@ -1,13 +1,8 @@
 # Exim test configuration 0077
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0078 b/test/confs/0078
index 7955d10c5..aa1e445f3 100644
--- a/test/confs/0078
+++ b/test/confs/0078
@@ -1,13 +1,8 @@
 # Exim test configuration 0078
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0079 b/test/confs/0079
index 3279e52e8..25ef65879 100644
--- a/test/confs/0079
+++ b/test/confs/0079
@@ -1,12 +1,7 @@
 # Exim test configuration 0079
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0080 b/test/confs/0080
index fc5f82449..fbe026c26 100644
--- a/test/confs/0080
+++ b/test/confs/0080
@@ -1,12 +1,7 @@
 # Exim test configuration 0080
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0081 b/test/confs/0081
index 29a35862b..f403728c3 100644
--- a/test/confs/0081
+++ b/test/confs/0081
@@ -1,12 +1,7 @@
 # Exim test configuration 0081
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0082 b/test/confs/0082
index 7219daf2d..29ff8d15c 100644
--- a/test/confs/0082
+++ b/test/confs/0082
@@ -1,12 +1,7 @@
 # Exim test configuration 0082
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0083 b/test/confs/0083
index e7b1a0486..fcae1f5d1 100644
--- a/test/confs/0083
+++ b/test/confs/0083
@@ -1,12 +1,7 @@
 # Exim test configuration 0083
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0084 b/test/confs/0084
index 44e57633d..94e386e02 100644
--- a/test/confs/0084
+++ b/test/confs/0084
@@ -1,13 +1,8 @@
 # Exim test configuration 0084
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0085 b/test/confs/0085
index efd52533c..25eea9e90 100644
--- a/test/confs/0085
+++ b/test/confs/0085
@@ -1,13 +1,8 @@
 # Exim test configuration 0085
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0086 b/test/confs/0086
index f512e3194..a0a29b62d 100644
--- a/test/confs/0086
+++ b/test/confs/0086
@@ -1,13 +1,8 @@
 # Exim test configuration 0086
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0087 b/test/confs/0087
index 2e8200a3d..8141edb98 100644
--- a/test/confs/0087
+++ b/test/confs/0087
@@ -1,13 +1,8 @@
 # Exim test configuration 0087
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0088 b/test/confs/0088
index 13f0ffc62..054944d95 100644
--- a/test/confs/0088
+++ b/test/confs/0088
@@ -1,13 +1,8 @@
 # Exim test configuration 0088
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0089 b/test/confs/0089
index 4b6bc6500..b8bd142db 100644
--- a/test/confs/0089
+++ b/test/confs/0089
@@ -1,13 +1,8 @@
 # Exim test configuration 0089
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0090 b/test/confs/0090
index 735ea021a..907d27544 100644
--- a/test/confs/0090
+++ b/test/confs/0090
@@ -1,13 +1,8 @@
 # Exim test configuration 0090
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0091 b/test/confs/0091
index 58bd6df71..2ef91af8f 100644
--- a/test/confs/0091
+++ b/test/confs/0091
@@ -1,13 +1,8 @@
 # Exim test configuration 0091
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0092 b/test/confs/0092
index e0c221bbf..e5cdf119a 100644
--- a/test/confs/0092
+++ b/test/confs/0092
@@ -7,14 +7,9 @@ domainlist local_domains = test.ex : *.test.ex
 
 domainlist relay_domains = test.ex
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0093 b/test/confs/0093
index e94481518..2ed0a5207 100644
--- a/test/confs/0093
+++ b/test/confs/0093
@@ -1,12 +1,7 @@
 # Exim test configuration 0093
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0094 b/test/confs/0094
index 79825c758..04c9d8078 100644
--- a/test/confs/0094
+++ b/test/confs/0094
@@ -1,12 +1,7 @@
 # Exim test configuration 0094
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0095 b/test/confs/0095
index ba3e7b805..c20b06d7c 100644
--- a/test/confs/0095
+++ b/test/confs/0095
@@ -3,14 +3,9 @@
 ERT=
 QWM=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0096 b/test/confs/0096
index 074dc2fd4..ff5f5cebc 100644
--- a/test/confs/0096
+++ b/test/confs/0096
@@ -1,12 +1,7 @@
 # Exim test configuration 0096
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0097 b/test/confs/0097
index 3c711253a..0841952bf 100644
--- a/test/confs/0097
+++ b/test/confs/0097
@@ -1,12 +1,7 @@
 # Exim test configuration 0097
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0098 b/test/confs/0098
index 03f94ac37..465c2310a 100644
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -2,13 +2,8 @@
 
 WMF=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0099 b/test/confs/0099
index 0b4c1372b..8b4299130 100644
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -2,13 +2,8 @@
 
 RETRY =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -24,7 +19,7 @@ begin routers
 
 bydns:
   driver = dnslookup
-  domains = mxt2.test.ex
+  domains = mxt2.test.ex : mxnonexist.test.ex
   transport = smtp
   fail_defer_domains = *
 
diff --git a/test/confs/0100 b/test/confs/0100
index d9843d074..c404d5a73 100644
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -1,12 +1,7 @@
 # Exim test configuration 0100
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0101 b/test/confs/0101
index 3b421a755..377eae705 100644
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -1,12 +1,7 @@
 # Exim test configuration 0101
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0102 b/test/confs/0102
index e9e7512df..dde11a5e9 100644
--- a/test/confs/0102
+++ b/test/confs/0102
@@ -1,12 +1,7 @@
 # Exim test configuration 0102
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0103 b/test/confs/0103
index 63311a21a..9a136c7bc 100644
--- a/test/confs/0103
+++ b/test/confs/0103
@@ -1,12 +1,7 @@
 # Exim test configuration 0103
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0104 b/test/confs/0104
index 18ce0b046..de0889adb 100644
--- a/test/confs/0104
+++ b/test/confs/0104
@@ -1,12 +1,7 @@
 # Exim test configuration 0104
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0105 b/test/confs/0105
index 3cc1a80e9..1b954f460 100644
--- a/test/confs/0105
+++ b/test/confs/0105
@@ -1,12 +1,7 @@
 # Exim test configuration 0105
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0106 b/test/confs/0106
index faaccd0c8..ef91e8b10 100644
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -1,13 +1,8 @@
 # Exim test configuration 0106
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0107 b/test/confs/0107
index 72bc6c5c2..9bbb7e7a3 100644
--- a/test/confs/0107
+++ b/test/confs/0107
@@ -1,12 +1,7 @@
 # Exim test configuration 0107
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0108 b/test/confs/0108
index f8e5d0b12..a4ee442e2 100644
--- a/test/confs/0108
+++ b/test/confs/0108
@@ -1,12 +1,7 @@
 # Exim test configuration 0108
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0109 b/test/confs/0109
index ebc53295d..59957b96b 100644
--- a/test/confs/0109
+++ b/test/confs/0109
@@ -1,12 +1,7 @@
 # Exim test configuration 0109
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0110 b/test/confs/0110
index 63377228c..361c12fb4 100644
--- a/test/confs/0110
+++ b/test/confs/0110
@@ -1,12 +1,7 @@
 # Exim test configuration 0110
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0111 b/test/confs/0111
index 9a840e956..61fc9a887 100644
--- a/test/confs/0111
+++ b/test/confs/0111
@@ -1,12 +1,7 @@
 # Exim test configuration 0111
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0112 b/test/confs/0112
index 312baae73..06e436abb 100644
--- a/test/confs/0112
+++ b/test/confs/0112
@@ -1,12 +1,7 @@
 # Exim test configuration 0112
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0113 b/test/confs/0113
index a5bc653fc..1fd61009f 100644
--- a/test/confs/0113
+++ b/test/confs/0113
@@ -1,12 +1,7 @@
 # Exim test configuration 0113
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0114 b/test/confs/0114
index 10cf42a82..d5a60bb00 100644
--- a/test/confs/0114
+++ b/test/confs/0114
@@ -1,12 +1,7 @@
 # Exim test configuration 0114
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0115 b/test/confs/0115
index aaf04e501..799112f08 100644
--- a/test/confs/0115
+++ b/test/confs/0115
@@ -1,12 +1,7 @@
 # Exim test configuration 0115
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0116 b/test/confs/0116
index e657b11c2..313d32c63 100644
--- a/test/confs/0116
+++ b/test/confs/0116
@@ -1,12 +1,7 @@
 # Exim test configuration 0116
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0117 b/test/confs/0117
index f80fc9ae5..5a266d32b 100644
--- a/test/confs/0117
+++ b/test/confs/0117
@@ -1,12 +1,7 @@
 # Exim test configuration 0117
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0118 b/test/confs/0118
index 45b9f79e4..cf8838f32 100644
--- a/test/confs/0118
+++ b/test/confs/0118
@@ -1,12 +1,7 @@
 # Exim test configuration 0118
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0119 b/test/confs/0119
index f33253242..4514635e5 100644
--- a/test/confs/0119
+++ b/test/confs/0119
@@ -1,12 +1,7 @@
 # Exim test configuration 0119
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0120 b/test/confs/0120
index 6ede1ee4e..95a5b3e8a 100644
--- a/test/confs/0120
+++ b/test/confs/0120
@@ -1,12 +1,7 @@
 # Exim test configuration 0120
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0121 b/test/confs/0121
index 6c6f65d3a..ca2d338a1 100644
--- a/test/confs/0121
+++ b/test/confs/0121
@@ -1,12 +1,7 @@
 # Exim test configuration 0121
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0122 b/test/confs/0122
index 8ed176fe3..3fec1235d 100644
--- a/test/confs/0122
+++ b/test/confs/0122
@@ -1,12 +1,7 @@
 # Exim test configuration 0122
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0123 b/test/confs/0123
index fc8ded626..6eae763a1 100644
--- a/test/confs/0123
+++ b/test/confs/0123
@@ -1,12 +1,7 @@
 # Exim test configuration 0123
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0124 b/test/confs/0124
index 8dff37eeb..da81a998a 100644
--- a/test/confs/0124
+++ b/test/confs/0124
@@ -1,12 +1,7 @@
 # Exim test configuration 0124
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0125 b/test/confs/0125
index 23547965f..69fe2d674 100644
--- a/test/confs/0125
+++ b/test/confs/0125
@@ -1,12 +1,7 @@
 # Exim test configuration 0125
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0126 b/test/confs/0126
index 5b4bb9c3b..537060608 100644
--- a/test/confs/0126
+++ b/test/confs/0126
@@ -1,13 +1,8 @@
 # Exim test configuration 0126
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0127 b/test/confs/0127
index f3dbe76e6..1906bb430 100644
--- a/test/confs/0127
+++ b/test/confs/0127
@@ -1,13 +1,8 @@
 # Exim test configuration 0127
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0128 b/test/confs/0128
index f81392e9c..9acfb5e9d 100644
--- a/test/confs/0128
+++ b/test/confs/0128
@@ -1,12 +1,7 @@
 # Exim test configuration 0128
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0129 b/test/confs/0129
index 0fe74070b..c91b02587 100644
--- a/test/confs/0129
+++ b/test/confs/0129
@@ -1,12 +1,7 @@
 # Exim test configuration 0129
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0130 b/test/confs/0130
index c6dfcc420..02a095358 100644
--- a/test/confs/0130
+++ b/test/confs/0130
@@ -1,12 +1,7 @@
 # Exim test configuration 0130
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0131 b/test/confs/0131
index 85aa1250d..c55813e77 100644
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -1,12 +1,7 @@
 # Exim test configuration 0131
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0132 b/test/confs/0132
index b018f2d6c..83bbb3608 100644
--- a/test/confs/0132
+++ b/test/confs/0132
@@ -1,12 +1,7 @@
 # Exim test configuration 0132
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0133 b/test/confs/0133
index c85cc8dc3..bc4e6283f 100644
--- a/test/confs/0133
+++ b/test/confs/0133
@@ -1,12 +1,7 @@
 # Exim test configuration 0133
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0134 b/test/confs/0134
index 8217278c4..9530df652 100644
--- a/test/confs/0134
+++ b/test/confs/0134
@@ -1,12 +1,7 @@
 # Exim test configuration 0134
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0135 b/test/confs/0135
index 549579f5b..2c62f0473 100644
--- a/test/confs/0135
+++ b/test/confs/0135
@@ -1,12 +1,7 @@
 # Exim test configuration 0135
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0136 b/test/confs/0136
index b35b4e078..efc73c58d 100644
--- a/test/confs/0136
+++ b/test/confs/0136
@@ -2,13 +2,8 @@
 
 BRB=true
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0137 b/test/confs/0137
index 82714a382..1a2094ef3 100644
--- a/test/confs/0137
+++ b/test/confs/0137
@@ -1,15 +1,11 @@
 # Exim test configuration 0137
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
+log_selector = +subject
 domainlist local_domains = test.ex
 qualify_domain = test.ex
 
diff --git a/test/confs/0138 b/test/confs/0138
index a59fc8d46..66539d6b0 100644
--- a/test/confs/0138
+++ b/test/confs/0138
@@ -1,12 +1,7 @@
 # Exim test configuration 0138
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0139 b/test/confs/0139
index a5a315e0a..eb3990c72 100644
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -1,12 +1,7 @@
 # Exim test configuration 0139
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0140 b/test/confs/0140
index d44f11a04..fbc64b43b 100644
--- a/test/confs/0140
+++ b/test/confs/0140
@@ -1,12 +1,7 @@
 # Exim test configuration 0140
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0141 b/test/confs/0141
index a9d2d2f68..96f6ef112 100644
--- a/test/confs/0141
+++ b/test/confs/0141
@@ -1,12 +1,7 @@
 # Exim test configuration 0141
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0142 b/test/confs/0142
index 86d911101..748e76b8b 100644
--- a/test/confs/0142
+++ b/test/confs/0142
@@ -1,12 +1,7 @@
 # Exim test configuration 0142
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0143 b/test/confs/0143
index fd3bb295d..5a6ee34a9 100644
--- a/test/confs/0143
+++ b/test/confs/0143
@@ -1,13 +1,8 @@
 # Exim test configuration 0143
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0144 b/test/confs/0144
index d337a8e1e..34b38230f 100644
--- a/test/confs/0144
+++ b/test/confs/0144
@@ -1,14 +1,9 @@
 # Exim test configuration 0144
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0145 b/test/confs/0145
index ab8cc6691..16b02a858 100644
--- a/test/confs/0145
+++ b/test/confs/0145
@@ -1,14 +1,9 @@
 # Exim test configuration 0145
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0146 b/test/confs/0146
index f2f0e26a3..d8b6067e7 100644
--- a/test/confs/0146
+++ b/test/confs/0146
@@ -1,14 +1,9 @@
 # Exim test configuration 0146
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0147 b/test/confs/0147
index 643e86d44..996d064be 100644
--- a/test/confs/0147
+++ b/test/confs/0147
@@ -6,15 +6,10 @@ x#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ABCD_XYZ = abcdxyz
 ABCD=abcd + ABCD_XYZ
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0148 b/test/confs/0148
index 6a87274d4..ea31cddbe 100644
--- a/test/confs/0148
+++ b/test/confs/0148
@@ -1,14 +1,9 @@
 # Exim test configuration 0148
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0149 b/test/confs/0149
index 33c022f22..60c742acf 100644
--- a/test/confs/0149
+++ b/test/confs/0149
@@ -1,14 +1,9 @@
 # Exim test configuration 0149
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0150 b/test/confs/0150
index fa4bac12e..dd421a125 100644
--- a/test/confs/0150
+++ b/test/confs/0150
@@ -1,12 +1,7 @@
 # Exim test configuration 0150
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0151 b/test/confs/0151
index 58aa30eed..d5d178654 100644
--- a/test/confs/0151
+++ b/test/confs/0151
@@ -1,12 +1,7 @@
 # Exim test configuration 0151
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0152 b/test/confs/0152
index 2804f6616..7671d52ed 100644
--- a/test/confs/0152
+++ b/test/confs/0152
@@ -1,12 +1,7 @@
 # Exim test configuration 0152
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0153 b/test/confs/0153
index c7fc79d54..c16f88fe9 100644
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -1,12 +1,7 @@
 # Exim test configuration 0153
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0154 b/test/confs/0154
index 84ed47d7d..bc5ffb899 100644
--- a/test/confs/0154
+++ b/test/confs/0154
@@ -1,12 +1,7 @@
 # Exim test configuration 0154
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0155 b/test/confs/0155
index b51837c4d..a85ebe5d7 100644
--- a/test/confs/0155
+++ b/test/confs/0155
@@ -1,12 +1,7 @@
 # Exim test configuration 0155
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0156 b/test/confs/0156
index 389811416..d1faa7514 100644
--- a/test/confs/0156
+++ b/test/confs/0156
@@ -1,12 +1,7 @@
 # Exim test configuration 0156
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0157 b/test/confs/0157
index 69556016e..1589f82ed 100644
--- a/test/confs/0157
+++ b/test/confs/0157
@@ -1,12 +1,7 @@
 # Exim test configuration 0157
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0158 b/test/confs/0158
index 5af747138..ccd261e56 100644
--- a/test/confs/0158
+++ b/test/confs/0158
@@ -1,12 +1,7 @@
 # Exim test configuration 0158
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0159 b/test/confs/0159
index 59d3087c9..e648d9304 100644
--- a/test/confs/0159
+++ b/test/confs/0159
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0160 b/test/confs/0160
index 68a5fe77a..f64883729 100644
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -1,13 +1,8 @@
 # Exim test configuration 0160
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0161 b/test/confs/0161
index 46175d9a0..8b91ea053 100644
--- a/test/confs/0161
+++ b/test/confs/0161
@@ -1,13 +1,8 @@
 # Exim test configuration 0161
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0162 b/test/confs/0162
index b8bc6ae55..0ec376230 100644
--- a/test/confs/0162
+++ b/test/confs/0162
@@ -1,13 +1,8 @@
 # Exim test configuration 0162
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0163 b/test/confs/0163
index 4b217eef6..7b19d9f16 100644
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -1,13 +1,8 @@
 # Exim test configuration 0163
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0164 b/test/confs/0164
index 1d28066b4..6d94efdfd 100644
--- a/test/confs/0164
+++ b/test/confs/0164
@@ -1,12 +1,7 @@
 # Exim test configuration 0164
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0165 b/test/confs/0165
index 03be27c40..03e9a825e 100644
--- a/test/confs/0165
+++ b/test/confs/0165
@@ -1,12 +1,7 @@
 # Exim test configuration 0165
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0166 b/test/confs/0166
index 6d492d7fd..93489dc56 100644
--- a/test/confs/0166
+++ b/test/confs/0166
@@ -1,12 +1,7 @@
 # Exim test configuration 0166
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0167 b/test/confs/0167
index 633993424..a65b9ed65 100644
--- a/test/confs/0167
+++ b/test/confs/0167
@@ -1,12 +1,7 @@
 # Exim test configuration 0167
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0168 b/test/confs/0168
index ea10f1244..196b8e60c 100644
--- a/test/confs/0168
+++ b/test/confs/0168
@@ -1,12 +1,7 @@
 # Exim test configuration 0168
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0169 b/test/confs/0169
index 4a42f0de2..beafec56d 100644
--- a/test/confs/0169
+++ b/test/confs/0169
@@ -1,13 +1,8 @@
 # Exim test configuration 0169
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0170 b/test/confs/0170
index 735b7b262..5e25e24d8 100644
--- a/test/confs/0170
+++ b/test/confs/0170
@@ -1,13 +1,8 @@
 # Exim test configuration 0170
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0171 b/test/confs/0171
index 2c2d18e41..fe4fc2c15 100644
--- a/test/confs/0171
+++ b/test/confs/0171
@@ -1,12 +1,7 @@
 # Exim test configuration 0171
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0172 b/test/confs/0172
index 82d1feac8..9dcc42f81 100644
--- a/test/confs/0172
+++ b/test/confs/0172
@@ -1,12 +1,7 @@
 # Exim test configuration 0172
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0173 b/test/confs/0173
index 6f8ded7cb..1b423e152 100644
--- a/test/confs/0173
+++ b/test/confs/0173
@@ -1,12 +1,7 @@
 # Exim test configuration 0173
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0174 b/test/confs/0174
index a3e11143e..b7fe882e2 100644
--- a/test/confs/0174
+++ b/test/confs/0174
@@ -1,12 +1,7 @@
 # Exim test configuration 0174
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0175 b/test/confs/0175
index 2898683e5..b20e4fe1a 100644
--- a/test/confs/0175
+++ b/test/confs/0175
@@ -1,12 +1,7 @@
 # Exim test configuration 0175
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0176 b/test/confs/0176
index cf5d41f15..81d0b5ddf 100644
--- a/test/confs/0176
+++ b/test/confs/0176
@@ -1,12 +1,7 @@
 # Exim test configuration 0176
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0177 b/test/confs/0177
index ccf9611f9..7921a8b55 100644
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -1,12 +1,7 @@
 # Exim test configuration 0177
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0178 b/test/confs/0178
index aaa83f0eb..bdabf6afa 100644
--- a/test/confs/0178
+++ b/test/confs/0178
@@ -1,12 +1,7 @@
 # Exim test configuration 0178
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0179 b/test/confs/0179
index d3a6da6fd..fdd5fb10c 100644
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -1,13 +1,8 @@
 # Exim test configuration 0179
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0180 b/test/confs/0180
index 663780b90..c4a0bd5af 100644
--- a/test/confs/0180
+++ b/test/confs/0180
@@ -1,15 +1,11 @@
 # Exim test configuration 0180
 
-CSS=check_spool_space=100000000K
+# Require immense amount of disk space, expecting to fail.  Can unfortunately work on big filesystems.
+CSS=check_spool_space=400G
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0181 b/test/confs/0181
index ab3bfdb2f..f00a9b28a 100644
--- a/test/confs/0181
+++ b/test/confs/0181
@@ -1,13 +1,8 @@
 # Exim test configuration 0181
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0182 b/test/confs/0182
index f76ae7f67..17d60789c 100644
--- a/test/confs/0182
+++ b/test/confs/0182
@@ -1,13 +1,8 @@
 # Exim test configuration 0182
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0183 b/test/confs/0183
index 65643d477..6699237a2 100644
--- a/test/confs/0183
+++ b/test/confs/0183
@@ -1,13 +1,8 @@
 # Exim test configuration 0183
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0184 b/test/confs/0184
index 9e43a38fd..9e15a4895 100644
--- a/test/confs/0184
+++ b/test/confs/0184
@@ -1,12 +1,7 @@
 # Exim test configuration 0184
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0185 b/test/confs/0185
index d88d1e2f9..d6e9fe020 100644
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -1,12 +1,7 @@
 # Exim test configuration 0185
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0186 b/test/confs/0186
index 5aa2c70d5..21b31060c 100644
--- a/test/confs/0186
+++ b/test/confs/0186
@@ -1,12 +1,7 @@
 # Exim test configuration 0186
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0187 b/test/confs/0187
index af570f0e0..bca41b5f7 100644
--- a/test/confs/0187
+++ b/test/confs/0187
@@ -1,12 +1,7 @@
 # Exim test configuration 0187
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0188 b/test/confs/0188
index 70eabdd51..d94506ef5 100644
--- a/test/confs/0188
+++ b/test/confs/0188
@@ -1,12 +1,7 @@
 # Exim test configuration 0188
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0189 b/test/confs/0189
index bc29d4961..5d12465b3 100644
--- a/test/confs/0189
+++ b/test/confs/0189
@@ -1,13 +1,8 @@
 # Exim test configuration 0189
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0190 b/test/confs/0190
index e76cdbbd1..03ded9ce2 100644
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -1,12 +1,7 @@
 # Exim test configuration 0190
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0191 b/test/confs/0191
index 4585e390a..9dba8c35d 100644
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -1,12 +1,7 @@
 # Exim test configuration 0191
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0192 b/test/confs/0192
index 42fb603ca..d7bd3c1b1 100644
--- a/test/confs/0192
+++ b/test/confs/0192
@@ -1,13 +1,8 @@
 # Exim test configuration 0192
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0193 b/test/confs/0193
index 1cba850e7..4dbb06679 100644
--- a/test/confs/0193
+++ b/test/confs/0193
@@ -1,13 +1,8 @@
 # Exim test configuration 0193
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0194 b/test/confs/0194
index e2c4160ea..d813d9290 100644
--- a/test/confs/0194
+++ b/test/confs/0194
@@ -1,13 +1,8 @@
 # Exim test configuration 0194
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0195 b/test/confs/0195
index 75c19ca62..2d51bebfa 100644
--- a/test/confs/0195
+++ b/test/confs/0195
@@ -1,13 +1,8 @@
 # Exim test configuration 0195
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0196 b/test/confs/0196
index 096aa30ab..38a839144 100644
--- a/test/confs/0196
+++ b/test/confs/0196
@@ -1,13 +1,8 @@
 # Exim test configuration 0196
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0197 b/test/confs/0197
index 32760b5a1..b3f25c4c0 100644
--- a/test/confs/0197
+++ b/test/confs/0197
@@ -3,13 +3,8 @@
 # Remove connection timeout when copying for real use,
 # and these settings.
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 queue_run_in_order
 trusted_users = CALLER
diff --git a/test/confs/0198 b/test/confs/0198
index 3946f8441..f754a3187 100644
--- a/test/confs/0198
+++ b/test/confs/0198
@@ -1,12 +1,7 @@
 # Exim test configuration 0198
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 queue_run_in_order
 trusted_users = CALLER
 
diff --git a/test/confs/0199 b/test/confs/0199
index e7e17716f..8b0e760f5 100644
--- a/test/confs/0199
+++ b/test/confs/0199
@@ -1,13 +1,8 @@
 # Exim test configuration 0199
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0200 b/test/confs/0200
index 0660b9a2e..ab50f36df 100644
--- a/test/confs/0200
+++ b/test/confs/0200
@@ -1,13 +1,8 @@
 # Exim test configuration 0200
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0201 b/test/confs/0201
index 0c1a0510a..5385baa9a 100644
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -1,13 +1,8 @@
 # Exim test configuration 0201
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0202 b/test/confs/0202
index 56f601416..dc68127ae 100644
--- a/test/confs/0202
+++ b/test/confs/0202
@@ -1,12 +1,7 @@
 # Exim test configuration 0202
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0203 b/test/confs/0203
index 3e7f49652..38e879010 100644
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -1,12 +1,7 @@
 # Exim test configuration 0203
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0204 b/test/confs/0204
index fa0400a91..138dbe0a1 100644
--- a/test/confs/0204
+++ b/test/confs/0204
@@ -1,13 +1,8 @@
 # Exim test configuration 0204
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0205 b/test/confs/0205
index 4dc1be78a..069e85033 100644
--- a/test/confs/0205
+++ b/test/confs/0205
@@ -1,13 +1,8 @@
 # Exim test configuration 0205
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0206 b/test/confs/0206
index 80fc0d851..628d2ec4d 100644
--- a/test/confs/0206
+++ b/test/confs/0206
@@ -1,13 +1,8 @@
 # Exim test configuration 0206
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0207 b/test/confs/0207
index 1bc90fe41..eed3e2565 100644
--- a/test/confs/0207
+++ b/test/confs/0207
@@ -1,13 +1,8 @@
 # Exim test configuration 0207
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0208 b/test/confs/0208
index 8a1a87dfe..5a0b9f153 100644
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -2,14 +2,9 @@
 
 MESSAGE_LOGS = true
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0209 b/test/confs/0209
index 28a3d6d77..82046c7bc 100644
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -1,12 +1,7 @@
 # Exim test configuration 0209
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0210 b/test/confs/0210
index 28e29cd6d..b1db52218 100644
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -1,12 +1,7 @@
 # Exim test configuration 0210
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0211 b/test/confs/0211
index 6a532b6a0..96f3beac1 100644
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -1,12 +1,7 @@
 # Exim test configuration 0211
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0212 b/test/confs/0212
index a4c623bd8..39db8c800 100644
--- a/test/confs/0212
+++ b/test/confs/0212
@@ -1,12 +1,7 @@
 # Exim test configuration 0212
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0213 b/test/confs/0213
index e28136352..ba0b9e403 100644
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -1,12 +1,7 @@
 # Exim test configuration 0213
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0214 b/test/confs/0214
index e06affae8..0e97c0ba6 100644
--- a/test/confs/0214
+++ b/test/confs/0214
@@ -1,13 +1,8 @@
 # Exim test configuration 0214
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0215 b/test/confs/0215
index 30277dac8..ad40d6338 100644
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -4,14 +4,9 @@ IGNORE_QUOTA=false
 AUTHS=
 AUTHF=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0216 b/test/confs/0216
index 777737c07..01e1dd801 100644
--- a/test/confs/0216
+++ b/test/confs/0216
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0217 b/test/confs/0217
index a446c2896..0b3abb71d 100644
--- a/test/confs/0217
+++ b/test/confs/0217
@@ -2,14 +2,9 @@
 
 HAP=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0218 b/test/confs/0218
index 4a96d825e..b5cb57691 100644
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -1,13 +1,8 @@
 # Exim test configuration 0218
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0219 b/test/confs/0219
index 9ae32da17..edf8f4abf 100644
--- a/test/confs/0219
+++ b/test/confs/0219
@@ -1,13 +1,8 @@
 # Exim test configuration 0219
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0220 b/test/confs/0220
index ef71838ac..36cf87223 100644
--- a/test/confs/0220
+++ b/test/confs/0220
@@ -1,13 +1,8 @@
 # Exim test configuration 0220
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0221 b/test/confs/0221
index 8cf29a197..f7855a678 100644
--- a/test/confs/0221
+++ b/test/confs/0221
@@ -1,13 +1,8 @@
 # Exim test configuration 0221
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0222 b/test/confs/0222
index f2ed82213..e69bbb3d0 100644
--- a/test/confs/0222
+++ b/test/confs/0222
@@ -1,13 +1,8 @@
 # Exim test configuration 0222
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0223 b/test/confs/0223
index 640b98cd1..e42df517e 100644
--- a/test/confs/0223
+++ b/test/confs/0223
@@ -1,12 +1,7 @@
 # Exim test configuration 0223
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0224 b/test/confs/0224
index 10b429e49..d1c425b47 100644
--- a/test/confs/0224
+++ b/test/confs/0224
@@ -1,12 +1,7 @@
 # Exim test configuration 0224
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0225 b/test/confs/0225
index 5a2cacef7..3139eea5b 100644
--- a/test/confs/0225
+++ b/test/confs/0225
@@ -1,12 +1,7 @@
 # Exim test configuration 0225
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0226 b/test/confs/0226
index b7117f257..0b6eeff74 100644
--- a/test/confs/0226
+++ b/test/confs/0226
@@ -1,12 +1,7 @@
 # Exim test configuration 0226
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0227 b/test/confs/0227
index 8aaf7a881..ed988ac85 100644
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -1,13 +1,8 @@
 # Exim test configuration 0227
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -31,6 +26,8 @@ check_recipient:
          !verify   = recipient/callout=no_cache
   deny    hosts    = V4NET.0.0.5
          !verify   = sender/callout=no_cache/check_postmaster
+  deny    hosts    = V4NET.0.0.6
+         !verify   = sender/callout=no_cache
   require verify   = sender
   accept  domains  = +local_domains
   deny    message  = relay not permitted
diff --git a/test/confs/0228 b/test/confs/0228
index 4253c38e0..19f6cb7cd 100644
--- a/test/confs/0228
+++ b/test/confs/0228
@@ -1,13 +1,8 @@
 # Exim test configuration 0228
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0229 b/test/confs/0229
index 0a299bfda..5389f97bc 100644
--- a/test/confs/0229
+++ b/test/confs/0229
@@ -1,13 +1,8 @@
 # Exim test configuration 0229
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0230 b/test/confs/0230
index c5fc9584c..c26b45758 100644
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -37,7 +32,7 @@ check_recipient:
 
 begin routers
 
-.ifdef RT
+.ifdef OPT
 to_server:
   driver = manualroute
   transport = remote
diff --git a/test/confs/0231 b/test/confs/0231
index c8dcbd2c9..d0adf3907 100644
--- a/test/confs/0231
+++ b/test/confs/0231
@@ -1,13 +1,8 @@
 # Exim test configuration 0231
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0232 b/test/confs/0232
index 9c9f55851..59e1ae918 100644
--- a/test/confs/0232
+++ b/test/confs/0232
@@ -1,13 +1,8 @@
 # Exim test configuration 0232
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0233 b/test/confs/0233
index 0fb615de7..77dcca3b2 100644
--- a/test/confs/0233
+++ b/test/confs/0233
@@ -1,13 +1,8 @@
 # Exim test configuration 0233
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0234 b/test/confs/0234
index 65df41a31..5d34833ac 100644
--- a/test/confs/0234
+++ b/test/confs/0234
@@ -1,13 +1,8 @@
 # Exim test configuration 0234
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0235 b/test/confs/0235
index 42cd93491..704767568 100644
--- a/test/confs/0235
+++ b/test/confs/0235
@@ -1,13 +1,8 @@
 # Exim test configuration 0235
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0236 b/test/confs/0236
index 05a544f13..e44fb46cd 100644
--- a/test/confs/0236
+++ b/test/confs/0236
@@ -1,13 +1,8 @@
 # Exim test configuration 0236
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0237 b/test/confs/0237
index a70f84f4d..be2f5abd2 100644
--- a/test/confs/0237
+++ b/test/confs/0237
@@ -1,12 +1,7 @@
 # Exim test configuration 0237
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0238 b/test/confs/0238
index b66c2160a..15aa22052 100644
--- a/test/confs/0238
+++ b/test/confs/0238
@@ -1,12 +1,7 @@
 # Exim test configuration 0238
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0239 b/test/confs/0239
index 7d7194dcd..f4b1a68ba 100644
--- a/test/confs/0239
+++ b/test/confs/0239
@@ -1,12 +1,7 @@
 # Exim test configuration 0239
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0240 b/test/confs/0240
index beaf6c985..bb4519ef8 100644
--- a/test/confs/0240
+++ b/test/confs/0240
@@ -1,12 +1,7 @@
 # Exim test configuration 0240
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0241 b/test/confs/0241
index 224c94a96..e7d92078b 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
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0242 b/test/confs/0242
index 3d4e6d825..fc2dd70ba 100644
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -1,13 +1,8 @@
 # Exim test configuration 0242
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0243 b/test/confs/0243
index 5f9811084..7396045ba 100644
--- a/test/confs/0243
+++ b/test/confs/0243
@@ -1,13 +1,8 @@
 # Exim test configuration 0243
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0244 b/test/confs/0244
index 6dd6b0cfe..668627e7a 100644
--- a/test/confs/0244
+++ b/test/confs/0244
@@ -1,13 +1,8 @@
 # Exim test configuration 0244
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0245 b/test/confs/0245
index d2050c7a3..13cb7038e 100644
--- a/test/confs/0245
+++ b/test/confs/0245
@@ -1,13 +1,8 @@
 # Exim test configuration 0245
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0246 b/test/confs/0246
index 9aad3e1a6..fb959527d 100644
--- a/test/confs/0246
+++ b/test/confs/0246
@@ -1,13 +1,8 @@
 # Exim test configuration 0246
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0247 b/test/confs/0247
index bab6c9220..38e171019 100644
--- a/test/confs/0247
+++ b/test/confs/0247
@@ -1,13 +1,8 @@
 # Exim test configuration 0247
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0248 b/test/confs/0248
index c91d4602d..517a2f665 100644
--- a/test/confs/0248
+++ b/test/confs/0248
@@ -1,13 +1,8 @@
 # Exim test configuration 0248
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0249 b/test/confs/0249
index c9425d8d6..1d7491be6 100644
--- a/test/confs/0249
+++ b/test/confs/0249
@@ -1,13 +1,8 @@
 # Exim test configuration 0249
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0250 b/test/confs/0250
index da0fb2e5d..80030ecd5 100644
--- a/test/confs/0250
+++ b/test/confs/0250
@@ -1,13 +1,8 @@
 # Exim test configuration 0250
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0251 b/test/confs/0251
index a6945ccca..180620f11 100644
--- a/test/confs/0251
+++ b/test/confs/0251
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0252 b/test/confs/0252
index c5d6fb6aa..28ce3419f 100644
--- a/test/confs/0252
+++ b/test/confs/0252
@@ -1,13 +1,8 @@
 # Exim test configuration 0252
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0253 b/test/confs/0253
index 00a4b60d8..cd2c777de 100644
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -1,13 +1,8 @@
 # Exim test configuration 0253
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0254 b/test/confs/0254
index f072c649e..45f5784bc 100644
--- a/test/confs/0254
+++ b/test/confs/0254
@@ -1,13 +1,8 @@
 # Exim test configuration 0254
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0255 b/test/confs/0255
index 341f704d4..e01c41baf 100644
--- a/test/confs/0255
+++ b/test/confs/0255
@@ -2,14 +2,9 @@
 
 OPTION=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0256 b/test/confs/0256
index 2e02fef4b..c5d5d4b4e 100644
--- a/test/confs/0256
+++ b/test/confs/0256
@@ -1,13 +1,8 @@
 # Exim test configuration 0256
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0257 b/test/confs/0257
index f2403a368..f61689380 100644
--- a/test/confs/0257
+++ b/test/confs/0257
@@ -1,13 +1,8 @@
 # Exim test configuration 0257
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0258 b/test/confs/0258
index de433734b..720cc4073 100644
--- a/test/confs/0258
+++ b/test/confs/0258
@@ -1,13 +1,8 @@
 # Exim test configuration 0258
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0259 b/test/confs/0259
index e5a42dd4a..6b9bc29ab 100644
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -1,14 +1,9 @@
 # Exim test configuration 0259
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 rfc1413_query_timeout = 5s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0260 b/test/confs/0260
index 442ab2880..6366cd0ad 100644
--- a/test/confs/0260
+++ b/test/confs/0260
@@ -1,13 +1,8 @@
 # Exim test configuration 0260
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0261 b/test/confs/0261
index e39db4670..30ec087fd 100644
--- a/test/confs/0261
+++ b/test/confs/0261
@@ -1,13 +1,8 @@
 # Exim test configuration 0261
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0262 b/test/confs/0262
index 92e65f428..dc6a1d4af 100644
--- a/test/confs/0262
+++ b/test/confs/0262
@@ -1,13 +1,8 @@
 # Exim test configuration 0262
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0263 b/test/confs/0263
index ac5599967..53b0064e7 100644
--- a/test/confs/0263
+++ b/test/confs/0263
@@ -1,13 +1,8 @@
 # Exim test configuration 0263
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0264 b/test/confs/0264
index 3d9505e88..792b304dd 100644
--- a/test/confs/0264
+++ b/test/confs/0264
@@ -1,13 +1,8 @@
 # Exim test configuration 0264
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0265 b/test/confs/0265
index 586805b78..b26583a41 100644
--- a/test/confs/0265
+++ b/test/confs/0265
@@ -1,13 +1,8 @@
 # Exim test configuration 0265
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0266 b/test/confs/0266
index 9fe2dfe26..d1e944dc2 100644
--- a/test/confs/0266
+++ b/test/confs/0266
@@ -1,13 +1,8 @@
 # Exim test configuration 0266
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0267 b/test/confs/0267
index 1e335bee3..bb134441b 100644
--- a/test/confs/0267
+++ b/test/confs/0267
@@ -1,13 +1,8 @@
 # Exim test configuration 0267
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0268 b/test/confs/0268
index 858397a25..e1e0be848 100644
--- a/test/confs/0268
+++ b/test/confs/0268
@@ -1,13 +1,8 @@
 # Exim test configuration 0268
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0269 b/test/confs/0269
index ce735dbe5..8aca95bd1 100644
--- a/test/confs/0269
+++ b/test/confs/0269
@@ -1,13 +1,8 @@
 # Exim test configuration 0269
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0270 b/test/confs/0270
index 117579e84..86f81d837 100644
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -1,13 +1,8 @@
 # Exim test configuration 0270
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0271 b/test/confs/0271
index 47aa77b8d..93c27241d 100644
--- a/test/confs/0271
+++ b/test/confs/0271
@@ -1,13 +1,8 @@
 # Exim test configuration 0271
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0272 b/test/confs/0272
index 42ae1a614..f3788f15c 100644
--- a/test/confs/0272
+++ b/test/confs/0272
@@ -1,13 +1,8 @@
 # Exim test configuration 0272
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0273 b/test/confs/0273
index b60b66271..0a12a6762 100644
--- a/test/confs/0273
+++ b/test/confs/0273
@@ -1,13 +1,8 @@
 # Exim test configuration 0273
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0274 b/test/confs/0274
index cd76881c4..2eb7bb60b 100644
--- a/test/confs/0274
+++ b/test/confs/0274
@@ -1,13 +1,8 @@
 # Exim test configuration 0274
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0275 b/test/confs/0275
index 2e62a907c..3734e03ea 100644
--- a/test/confs/0275
+++ b/test/confs/0275
@@ -1,13 +1,8 @@
 # Exim test configuration 0275
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0276 b/test/confs/0276
index db4afafdc..257cf4593 100644
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -1,13 +1,8 @@
 # Exim test configuration 0276
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0277 b/test/confs/0277
index eeb79e6c7..8e1bdc375 100644
--- a/test/confs/0277
+++ b/test/confs/0277
@@ -1,13 +1,8 @@
 # Exim test configuration 0277
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0278 b/test/confs/0278
index 255ecef34..a7adb29ec 100644
--- a/test/confs/0278
+++ b/test/confs/0278
@@ -1,13 +1,8 @@
 # Exim test configuration 0278
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0279 b/test/confs/0279
index d8ec85dc2..f4334f479 100644
--- a/test/confs/0279
+++ b/test/confs/0279
@@ -1,13 +1,8 @@
 # Exim test configuration 0279
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0280 b/test/confs/0280
index 3552582b0..40187df77 100644
--- a/test/confs/0280
+++ b/test/confs/0280
@@ -1,13 +1,8 @@
 # Exim test configuration 0280
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0281 b/test/confs/0281
index 19e2e5527..277328ed4 100644
--- a/test/confs/0281
+++ b/test/confs/0281
@@ -1,13 +1,8 @@
 # Exim test configuration 0281
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0282 b/test/confs/0282
index a77ac9ab5..2660c7f7d 100644
--- a/test/confs/0282
+++ b/test/confs/0282
@@ -1,13 +1,8 @@
 # Exim test configuration 0282
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0283 b/test/confs/0283
index 93107d6db..31d9339a2 100644
--- a/test/confs/0283
+++ b/test/confs/0283
@@ -1,13 +1,8 @@
 # Exim test configuration 0283
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0284 b/test/confs/0284
index 5ba209af5..d38f38390 100644
--- a/test/confs/0284
+++ b/test/confs/0284
@@ -1,13 +1,8 @@
 # Exim test configuration 0284
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0285 b/test/confs/0285
index 65095f0c0..f0871a565 100644
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -1,13 +1,8 @@
 # Exim test configuration 0285
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0286 b/test/confs/0286
index b720a80c2..8ec70bfbb 100644
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -1,13 +1,8 @@
 # Exim test configuration 0286
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0287 b/test/confs/0287
index 08a87a3f4..d3f08a205 100644
--- a/test/confs/0287
+++ b/test/confs/0287
@@ -1,13 +1,8 @@
 # Exim test configuration 0287
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0288 b/test/confs/0288
index 0e9136bf3..12c308baf 100644
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -1,14 +1,9 @@
 # Exim test configuration 0288
 # serialize_hosts option on smtp transport
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0289 b/test/confs/0289
index 66734518a..8cd201862 100644
--- a/test/confs/0289
+++ b/test/confs/0289
@@ -1,14 +1,9 @@
 # Exim test configuration 0289
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0290 b/test/confs/0290
index 57e328216..5ccb8451f 100644
--- a/test/confs/0290
+++ b/test/confs/0290
@@ -3,27 +3,22 @@
 FOOBAR=
 FOO=inc1
 BAR=.include "DIR/aux-fixed/TESTNUM.inc2"
-RT = receive_timeout = 1s
+OPT = receive_timeout = 1s
 INC=
 
 C1=#
 C2=#
 C1C2 this should be a comment
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
 FOOBAR  .include DIR/aux-fixed/TESTNUM.FOO
-RT
+OPT
 INC
 
 remote_sort_domains = a:b:c
diff --git a/test/confs/0291 b/test/confs/0291
index 8eb6af279..406c54faa 100644
--- a/test/confs/0291
+++ b/test/confs/0291
@@ -1,14 +1,9 @@
 # Exim test configuration 0291
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0292 b/test/confs/0292
index a388ebd3a..6e70a7925 100644
--- a/test/confs/0292
+++ b/test/confs/0292
@@ -1,14 +1,9 @@
 # Exim test configuration 0292
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0293 b/test/confs/0293
index 84f79b88a..0512860f4 100644
--- a/test/confs/0293
+++ b/test/confs/0293
@@ -1,14 +1,9 @@
 # Exim test configuration 0293
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0294 b/test/confs/0294
index 6b8a6112e..6e17b832d 100644
--- a/test/confs/0294
+++ b/test/confs/0294
@@ -1,14 +1,9 @@
 # Exim test configuration 0294
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0295 b/test/confs/0295
index ea16f79d7..997b83c6b 100644
--- a/test/confs/0295
+++ b/test/confs/0295
@@ -1,14 +1,9 @@
 # Exim test configuration 0295
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0296 b/test/confs/0296
index fe7531502..e62a3d1a1 100644
--- a/test/confs/0296
+++ b/test/confs/0296
@@ -1,13 +1,8 @@
 # Exim test configuration 0296
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0297 b/test/confs/0297
index 8e692b690..b07fc54cb 100644
--- a/test/confs/0297
+++ b/test/confs/0297
@@ -1,13 +1,8 @@
 # Exim test configuration 0297
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0298 b/test/confs/0298
index 47228e6af..3ca06f87f 100644
--- a/test/confs/0298
+++ b/test/confs/0298
@@ -1,13 +1,8 @@
 # Exim test configuration 0298
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0299 b/test/confs/0299
index 619132bc7..5d648b85d 100644
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -1,13 +1,8 @@
 # Exim test configuration 0299
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0300 b/test/confs/0300
index cf47c2b79..814f8ee0f 100644
--- a/test/confs/0300
+++ b/test/confs/0300
@@ -3,14 +3,9 @@
 DELAY=0s
 PAH=127.0.0.1
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0301 b/test/confs/0301
index 493f5a0dd..2ce525c01 100644
--- a/test/confs/0301
+++ b/test/confs/0301
@@ -1,13 +1,8 @@
 # Exim test configuration 0301
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0302 b/test/confs/0302
index 41c7af7fe..81aadbba1 100644
--- a/test/confs/0302
+++ b/test/confs/0302
@@ -1,13 +1,8 @@
 # Exim test configuration 0302
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0303 b/test/confs/0303
index 7670b60b6..b96063e96 100644
--- a/test/confs/0303
+++ b/test/confs/0303
@@ -1,13 +1,8 @@
 # Exim test configuration 0303
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0304 b/test/confs/0304
index 7f1e658bd..6c899aaec 100644
--- a/test/confs/0304
+++ b/test/confs/0304
@@ -1,13 +1,8 @@
 # Exim test configuration 0304
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0305 b/test/confs/0305
index ceb51a82a..33e97ef6a 100644
--- a/test/confs/0305
+++ b/test/confs/0305
@@ -1,13 +1,8 @@
 # Exim test configuration 0305
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0306 b/test/confs/0306
index 2526d9df1..6d6d9658a 100644
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -1,13 +1,8 @@
 # Exim test configuration 0306
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0307 b/test/confs/0307
index 5e664452b..3252b4615 100644
--- a/test/confs/0307
+++ b/test/confs/0307
@@ -1,13 +1,8 @@
 # Exim test configuration 0307
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0308 b/test/confs/0308
index cf90b6e23..dd2f6dd50 100644
--- a/test/confs/0308
+++ b/test/confs/0308
@@ -1,13 +1,8 @@
 # Exim test configuration 0308
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0309 b/test/confs/0309
index 2f7ccf0c3..4d6449009 100644
--- a/test/confs/0309
+++ b/test/confs/0309
@@ -1,13 +1,8 @@
 # Exim test configuration 0309
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0310 b/test/confs/0310
index 45eab9213..0f324da1d 100644
--- a/test/confs/0310
+++ b/test/confs/0310
@@ -1,13 +1,8 @@
 # Exim test configuration 0310
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0311 b/test/confs/0311
index 5f7a791dd..99082cb7f 100644
--- a/test/confs/0311
+++ b/test/confs/0311
@@ -1,13 +1,8 @@
 # Exim test configuration 0311
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0312 b/test/confs/0312
index 78a56c03e..dad5d083c 100644
--- a/test/confs/0312
+++ b/test/confs/0312
@@ -1,13 +1,8 @@
 # Exim test configuration 0312
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0313 b/test/confs/0313
index 64e061215..7849526db 100644
--- a/test/confs/0313
+++ b/test/confs/0313
@@ -1,12 +1,7 @@
 # Exim test configuration 0313
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0314 b/test/confs/0314
index d9a066075..9dd0295a5 100644
--- a/test/confs/0314
+++ b/test/confs/0314
@@ -1,15 +1,13 @@
 # Exim test configuration 0314
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+LOG_SELECTOR=
+
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
-host_reject_connection = V4NET.0.0.1
+log_selector = LOG_SELECTOR
+host_reject_connection = 127.0.0.1
 
 # End
diff --git a/test/confs/0315 b/test/confs/0315
index afa292ddc..fed3ceca1 100644
--- a/test/confs/0315
+++ b/test/confs/0315
@@ -1,12 +1,7 @@
 # Exim test configuration 0315
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0316 b/test/confs/0316
index 1a6238b8c..22fea04ca 100644
--- a/test/confs/0316
+++ b/test/confs/0316
@@ -1,12 +1,7 @@
 # Exim test configuration 0316
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0317 b/test/confs/0317
index 2c3e66198..754231606 100644
--- a/test/confs/0317
+++ b/test/confs/0317
@@ -1,12 +1,7 @@
 # Exim test configuration 0317
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0318 b/test/confs/0318
index e57fe8eee..51633d997 100644
--- a/test/confs/0318
+++ b/test/confs/0318
@@ -1,12 +1,7 @@
 # Exim test configuration 0318
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0319 b/test/confs/0319
index 8a279a521..aaa21d730 100644
--- a/test/confs/0319
+++ b/test/confs/0319
@@ -1,12 +1,7 @@
 # Exim test configuration 0319
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0320 b/test/confs/0320
index e9191ee35..6f287a89c 100644
--- a/test/confs/0320
+++ b/test/confs/0320
@@ -1,12 +1,7 @@
 # Exim test configuration 0320
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0321 b/test/confs/0321
index 6ea0bcfe9..624202e65 100644
--- a/test/confs/0321
+++ b/test/confs/0321
@@ -1,12 +1,7 @@
 # Exim test configuration 0321
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0322 b/test/confs/0322
index 2901010ad..396b0c653 100644
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -1,20 +1,11 @@
 # Exim test configuration 0322
 
-LS=
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
-log_selector = LS
-
 # ----- Routers -----
 
 begin routers
diff --git a/test/confs/0323 b/test/confs/0323
index 253f8372c..554ccbaf8 100644
--- a/test/confs/0323
+++ b/test/confs/0323
@@ -1,13 +1,8 @@
 # Exim test configuration 0323
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0324 b/test/confs/0324
index e1353ccc1..129e5df4c 100644
--- a/test/confs/0324
+++ b/test/confs/0324
@@ -1,13 +1,8 @@
 # Exim test configuration 0324
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0325 b/test/confs/0325
index 4d145d851..e81e63b42 100644
--- a/test/confs/0325
+++ b/test/confs/0325
@@ -1,13 +1,8 @@
 # Exim test configuration 0325
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0326 b/test/confs/0326
index 5081f88a2..8f44d3c34 100644
--- a/test/confs/0326
+++ b/test/confs/0326
@@ -1,13 +1,8 @@
 # Exim test configuration 0326
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0327 b/test/confs/0327
index 28922ed73..481aaa7ae 100644
--- a/test/confs/0327
+++ b/test/confs/0327
@@ -1,13 +1,8 @@
 # Exim test configuration 0327
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0328 b/test/confs/0328
index 48d29a4a3..76f898552 100644
--- a/test/confs/0328
+++ b/test/confs/0328
@@ -1,13 +1,8 @@
 # Exim test configuration 0328
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0329 b/test/confs/0329
index 1d853fa91..f9d5bcbb5 100644
--- a/test/confs/0329
+++ b/test/confs/0329
@@ -1,13 +1,8 @@
 # Exim test configuration 0329
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0330 b/test/confs/0330
index 9d53d7a79..78701a9c5 100644
--- a/test/confs/0330
+++ b/test/confs/0330
@@ -1,12 +1,7 @@
 # Exim test configuration 0330
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0331 b/test/confs/0331
index 934030529..48ddf9037 100644
--- a/test/confs/0331
+++ b/test/confs/0331
@@ -1,12 +1,7 @@
 # Exim test configuration 0331
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0332 b/test/confs/0332
index bf16c2ea7..4fe3b3fd4 100644
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -1,13 +1,8 @@
 # Exim test configuration 0332
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0333 b/test/confs/0333
index 388987333..419229285 100644
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -1,13 +1,8 @@
 # Exim test configuration 0333
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0334 b/test/confs/0334
index a04081e52..553763b0a 100644
--- a/test/confs/0334
+++ b/test/confs/0334
@@ -1,13 +1,8 @@
 # Exim test configuration 0334
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0335 b/test/confs/0335
index e78f4ebe1..6529028d5 100644
--- a/test/confs/0335
+++ b/test/confs/0335
@@ -1,13 +1,8 @@
 # Exim test configuration 0335
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0336 b/test/confs/0336
index d85ab8489..8ec447591 100644
--- a/test/confs/0336
+++ b/test/confs/0336
@@ -1,13 +1,8 @@
 # Exim test configuration 0336
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0337 b/test/confs/0337
index 026d4f724..7dedf5fe1 100644
--- a/test/confs/0337
+++ b/test/confs/0337
@@ -1,13 +1,8 @@
 # Exim test configuration 0337
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0338 b/test/confs/0338
index 1ea147be3..d373f477c 100644
--- a/test/confs/0338
+++ b/test/confs/0338
@@ -1,13 +1,8 @@
 # Exim test configuration 0338
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0339 b/test/confs/0339
index 8048352fd..843dd0222 100644
--- a/test/confs/0339
+++ b/test/confs/0339
@@ -1,13 +1,8 @@
 # Exim test configuration 0339
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0340 b/test/confs/0340
index a824813ac..a4b49d8ad 100644
--- a/test/confs/0340
+++ b/test/confs/0340
@@ -1,13 +1,8 @@
 # Exim test configuration 0340
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0341 b/test/confs/0341
index f873809e2..726793390 100644
--- a/test/confs/0341
+++ b/test/confs/0341
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0342 b/test/confs/0342
index b0053226a..dba9020f4 100644
--- a/test/confs/0342
+++ b/test/confs/0342
@@ -1,13 +1,8 @@
 # Exim test configuration 0342
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0343 b/test/confs/0343
index 2dc7d6e49..c613da449 100644
--- a/test/confs/0343
+++ b/test/confs/0343
@@ -1,13 +1,8 @@
 # Exim test configuration 0343
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0344 b/test/confs/0344
index 591294deb..0b29b0629 100644
--- a/test/confs/0344
+++ b/test/confs/0344
@@ -1,13 +1,8 @@
 # Exim test configuration 0344
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0345 b/test/confs/0345
index d57ba1100..99bdce0b4 100644
--- a/test/confs/0345
+++ b/test/confs/0345
@@ -1,12 +1,7 @@
 # Exim test configuration 0345
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0346 b/test/confs/0346
index 9d648dcde..1c4b51c50 100644
--- a/test/confs/0346
+++ b/test/confs/0346
@@ -1,12 +1,7 @@
 # Exim test configuration 0346
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0347 b/test/confs/0347
index 506524279..993b3fd1f 100644
--- a/test/confs/0347
+++ b/test/confs/0347
@@ -1,12 +1,7 @@
 # Exim test configuration 0347
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0348 b/test/confs/0348
index 651a94fe4..60f8d208b 100644
--- a/test/confs/0348
+++ b/test/confs/0348
@@ -2,13 +2,8 @@
 
 RETRY=G,1,20m,1.5
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0349 b/test/confs/0349
index ff3bd857e..f11957d2e 100644
--- a/test/confs/0349
+++ b/test/confs/0349
@@ -1,12 +1,7 @@
 # Exim test configuration 0349
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0350 b/test/confs/0350
index a3d606946..09bd635db 100644
--- a/test/confs/0350
+++ b/test/confs/0350
@@ -1,13 +1,8 @@
 # Exim test configuration 0350
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0351 b/test/confs/0351
index 0c306f5c0..b00ee7497 100644
--- a/test/confs/0351
+++ b/test/confs/0351
@@ -1,12 +1,7 @@
 # Exim test configuration 0351
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0352 b/test/confs/0352
index e3e9555f3..aaa980941 100644
--- a/test/confs/0352
+++ b/test/confs/0352
@@ -1,12 +1,7 @@
 # Exim test configuration 0352
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0353 b/test/confs/0353
index 566cb284c..fb53d6d69 100644
--- a/test/confs/0353
+++ b/test/confs/0353
@@ -1,12 +1,7 @@
 # Exim test configuration 0353
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0354 b/test/confs/0354
index b1b92692d..03ea43f83 100644
--- a/test/confs/0354
+++ b/test/confs/0354
@@ -1,12 +1,7 @@
 # Exim test configuration 0354
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0355 b/test/confs/0355
index 7523892a9..78b1484c7 100644
--- a/test/confs/0355
+++ b/test/confs/0355
@@ -1,12 +1,7 @@
 # Exim test configuration 0355
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0356 b/test/confs/0356
index 12dc13ab8..c6e9e94a1 100644
--- a/test/confs/0356
+++ b/test/confs/0356
@@ -2,13 +2,8 @@
 
 MESSAGE_LOGS =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0357 b/test/confs/0357
index 45ca7d320..07f3fc857 100644
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -1,12 +1,7 @@
 # Exim test configuration 0357
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0358 b/test/confs/0358
index d6665da51..24611d0fb 100644
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -1,12 +1,7 @@
 # Exim test configuration 0358
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0359 b/test/confs/0359
index 1975cf378..6b6b8c093 100644
--- a/test/confs/0359
+++ b/test/confs/0359
@@ -1,12 +1,7 @@
 # Exim test configuration 0359
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0360 b/test/confs/0360
index b24010459..d226449a8 100644
--- a/test/confs/0360
+++ b/test/confs/0360
@@ -1,12 +1,7 @@
 # Exim test configuration 0360
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0361 b/test/confs/0361
index 275ae21a4..f9007ec0c 100644
--- a/test/confs/0361
+++ b/test/confs/0361
@@ -1,12 +1,7 @@
 # Exim test configuration 0361
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0362 b/test/confs/0362
index 15ea70fbe..6588f609f 100644
--- a/test/confs/0362
+++ b/test/confs/0362
@@ -1,12 +1,7 @@
 # Exim test configuration 0362
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0363 b/test/confs/0363
index bddeb243e..c43040876 100644
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -1,12 +1,7 @@
 # Exim test configuration 0363
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0364 b/test/confs/0364
index 706618d1b..e15bc9127 100644
--- a/test/confs/0364
+++ b/test/confs/0364
@@ -1,12 +1,7 @@
 # Exim test configuration 0364
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0365 b/test/confs/0365
index dbe113d28..0bd6cc161 100644
--- a/test/confs/0365
+++ b/test/confs/0365
@@ -3,13 +3,8 @@
 DETAILS=false
 SELECTOR=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0366 b/test/confs/0366
index ec639aee7..de5d9cfc8 100644
--- a/test/confs/0366
+++ b/test/confs/0366
@@ -2,13 +2,8 @@
 
 HOSTS_MAX_TRY=5
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0367 b/test/confs/0367
index bf743c883..2d69a07ab 100644
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -1,12 +1,7 @@
 # Exim test configuration 0367
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0368 b/test/confs/0368
index 08fffb406..fee202781 100644
--- a/test/confs/0368
+++ b/test/confs/0368
@@ -1,13 +1,8 @@
 # Exim test configuration 0368
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0369 b/test/confs/0369
index 7829414f1..511c541f6 100644
--- a/test/confs/0369
+++ b/test/confs/0369
@@ -1,13 +1,8 @@
 # Exim test configuration 0369
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0370 b/test/confs/0370
index 63aad00be..315a56872 100644
--- a/test/confs/0370
+++ b/test/confs/0370
@@ -1,13 +1,8 @@
 # Exim test configuration 0370
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0371 b/test/confs/0371
index 680377fcd..eb4d07fb8 100644
--- a/test/confs/0371
+++ b/test/confs/0371
@@ -1,12 +1,7 @@
 # Exim test configuration 0371
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0372 b/test/confs/0372
index 6e457e7f5..983d596a1 100644
--- a/test/confs/0372
+++ b/test/confs/0372
@@ -2,14 +2,9 @@
 
 STRICT=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0373 b/test/confs/0373
index 9f672ced0..10d64b782 100644
--- a/test/confs/0373
+++ b/test/confs/0373
@@ -1,13 +1,8 @@
 # Exim test configuration 0373
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0374 b/test/confs/0374
index 87b3e182d..652a5062b 100644
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -1,13 +1,8 @@
 # Exim test configuration 0374
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0375 b/test/confs/0375
index 229230209..06b16f383 100644
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -1,13 +1,8 @@
 # Exim test configuration 0375
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0376 b/test/confs/0376
index de6feb6d1..6162c2c9d 100644
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -2,14 +2,9 @@
 
 PEX=10s
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0377 b/test/confs/0377
index 362ec37f1..bd3391b3a 100644
--- a/test/confs/0377
+++ b/test/confs/0377
@@ -1,13 +1,8 @@
 # Exim test configuration 0377
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0378 b/test/confs/0378
index 8046c87f8..3e4d85a81 100644
--- a/test/confs/0378
+++ b/test/confs/0378
@@ -1,13 +1,8 @@
 # Exim test configuration 0378
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0379 b/test/confs/0379
index 6dae00b93..2f1216b1f 100644
--- a/test/confs/0379
+++ b/test/confs/0379
@@ -1,13 +1,8 @@
 # Exim test configuration 0379
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0380 b/test/confs/0380
index 4b478d3d4..90d1f933b 100644
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -1,13 +1,8 @@
 # Exim test configuration 0380
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0381 b/test/confs/0381
index 02a84a85c..0a9d8dc20 100644
--- a/test/confs/0381
+++ b/test/confs/0381
@@ -1,13 +1,8 @@
 # Exim test configuration 0381
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0382 b/test/confs/0382
index 3dae69dd4..d27b8e3f7 100644
--- a/test/confs/0382
+++ b/test/confs/0382
@@ -1,13 +1,8 @@
 # Exim test configuration 0382
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0383 b/test/confs/0383
index 51d8f8f37..ea2f1dc28 100644
--- a/test/confs/0383
+++ b/test/confs/0383
@@ -1,13 +1,8 @@
 # Exim test configuration 0383
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0384 b/test/confs/0384
index 0287358c0..80450a7e8 100644
--- a/test/confs/0384
+++ b/test/confs/0384
@@ -1,13 +1,8 @@
 # Exim test configuration 0384
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0385 b/test/confs/0385
index 39689c556..f66e6b818 100644
--- a/test/confs/0385
+++ b/test/confs/0385
@@ -1,13 +1,8 @@
 # Exim test configuration 0385
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0386 b/test/confs/0386
index b466066a3..5eecfcc98 100644
--- a/test/confs/0386
+++ b/test/confs/0386
@@ -1,13 +1,8 @@
 # Exim test configuration 0386
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0387 b/test/confs/0387
index 4193a139f..b8ed35ccc 100644
--- a/test/confs/0387
+++ b/test/confs/0387
@@ -1,13 +1,8 @@
 # Exim test configuration 0387
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0388 b/test/confs/0388
index 38166b449..9a7be305d 100644
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -1,13 +1,8 @@
 # Exim test configuration 0388
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0389 b/test/confs/0389
index fabc15179..f2439bf58 100644
--- a/test/confs/0389
+++ b/test/confs/0389
@@ -1,13 +1,8 @@
 # Exim test configuration 0389
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0390 b/test/confs/0390
index 5b88cd7b2..972e925d9 100644
--- a/test/confs/0390
+++ b/test/confs/0390
@@ -1,13 +1,8 @@
 # Exim test configuration 0390
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0391 b/test/confs/0391
index a2ee5ef9d..4ab5cfddd 100644
--- a/test/confs/0391
+++ b/test/confs/0391
@@ -1,13 +1,8 @@
 # Exim test configuration 0391
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0392 b/test/confs/0392
index ae809d52f..e76c86772 100644
--- a/test/confs/0392
+++ b/test/confs/0392
@@ -1,13 +1,8 @@
 # Exim test configuration 0392
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0393 b/test/confs/0393
index d83857170..c029d0d71 100644
--- a/test/confs/0393
+++ b/test/confs/0393
@@ -2,13 +2,8 @@
 
 FILTER=/bin/cat
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0394 b/test/confs/0394
index 7e6511964..c1a556357 100644
--- a/test/confs/0394
+++ b/test/confs/0394
@@ -2,13 +2,8 @@
 
 OPT=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0395 b/test/confs/0395
index 4e00be813..b7fc3fd58 100644
--- a/test/confs/0395
+++ b/test/confs/0395
@@ -2,13 +2,8 @@
 
 TRUSTED=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0396 b/test/confs/0396
index 2dac89ab9..ef2ad8a55 100644
--- a/test/confs/0396
+++ b/test/confs/0396
@@ -1,12 +1,7 @@
 # Exim test configuration 0396
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0397 b/test/confs/0397
index 50403df7a..0fe3e8ee2 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
 spool_directory = DIR/spool
 gecos_pattern = ""
diff --git a/test/confs/0398 b/test/confs/0398
index 0bed7ddbb..9fbe1b8da 100644
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -1,12 +1,7 @@
 # Exim test configuration 0398
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0399 b/test/confs/0399
index 38da70b6c..5584e509c 100644
--- a/test/confs/0399
+++ b/test/confs/0399
@@ -1,12 +1,7 @@
 # Exim test configuration 0399
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0400 b/test/confs/0400
index 2c44a2b74..1a8a8e43b 100644
--- a/test/confs/0400
+++ b/test/confs/0400
@@ -2,13 +2,8 @@
 
 DATA=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0401 b/test/confs/0401
index bd9a15c82..b8c105983 100644
--- a/test/confs/0401
+++ b/test/confs/0401
@@ -1,12 +1,7 @@
 # Exim test configuration 0401
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0402 b/test/confs/0402
index 9e9ccf956..57e027c03 100644
--- a/test/confs/0402
+++ b/test/confs/0402
@@ -1,12 +1,7 @@
 # Exim test configuration 0402
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0403 b/test/confs/0403
index bdc84841a..26d1cd6fe 100644
--- a/test/confs/0403
+++ b/test/confs/0403
@@ -1,12 +1,7 @@
 # Exim test configuration 0403
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0404 b/test/confs/0404
index e9b23f0f0..9d0dc5c90 100644
--- a/test/confs/0404
+++ b/test/confs/0404
@@ -1,12 +1,7 @@
 # Exim test configuration 0404
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0405 b/test/confs/0405
index d1f77cd82..edf720c48 100644
--- a/test/confs/0405
+++ b/test/confs/0405
@@ -2,13 +2,8 @@
 
 UTF8=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0406 b/test/confs/0406
index 37b6bab07..1c1ec205f 100644
--- a/test/confs/0406
+++ b/test/confs/0406
@@ -1,12 +1,7 @@
 # Exim test configuration 0406
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0407 b/test/confs/0407
index 364786199..616b80a13 100644
--- a/test/confs/0407
+++ b/test/confs/0407
@@ -3,13 +3,8 @@
 HEADER_MAXSIZE=
 HEADER_LINE_MAXSIZE=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0408 b/test/confs/0408
index 6df40fa9e..903b4ca7c 100644
--- a/test/confs/0408
+++ b/test/confs/0408
@@ -1,12 +1,7 @@
 # Exim test configuration 0408
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0409 b/test/confs/0409
index c077da26b..3cc072b20 100644
--- a/test/confs/0409
+++ b/test/confs/0409
@@ -2,13 +2,8 @@
 
 BANNER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0410 b/test/confs/0410
index 8fb017178..904073d3b 100644
--- a/test/confs/0410
+++ b/test/confs/0410
@@ -1,12 +1,7 @@
 # Exim test configuration 0410
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0411 b/test/confs/0411
index c2c238507..fa24e9fd0 100644
--- a/test/confs/0411
+++ b/test/confs/0411
@@ -1,12 +1,7 @@
 # Exim test configuration 0411
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0412 b/test/confs/0412
index 9a38058d7..f8b9c69ff 100644
--- a/test/confs/0412
+++ b/test/confs/0412
@@ -1,12 +1,7 @@
 # Exim test configuration 0412
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0413 b/test/confs/0413
index e0d4fa329..118dbcfe9 100644
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -1,12 +1,7 @@
 # Exim test configuration 0413
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0414 b/test/confs/0414
index 9d269d959..c0fbeffdb 100644
--- a/test/confs/0414
+++ b/test/confs/0414
@@ -1,12 +1,7 @@
 # Exim test configuration 0414
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0415 b/test/confs/0415
index aceaacc46..06459597f 100644
--- a/test/confs/0415
+++ b/test/confs/0415
@@ -4,13 +4,8 @@ ARG1=40M
 ARG2=1.0
 VALUE=0
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0416 b/test/confs/0416
index 2290da4b3..752ba0495 100644
--- a/test/confs/0416
+++ b/test/confs/0416
@@ -1,12 +1,7 @@
 # Exim test configuration 0416
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0417 b/test/confs/0417
index f759e63d6..41c5ed975 100644
--- a/test/confs/0417
+++ b/test/confs/0417
@@ -2,13 +2,8 @@
 
 RETURN_ERROR_DETAILS = false
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0418 b/test/confs/0418
index b44214388..3ab5740c0 100644
--- a/test/confs/0418
+++ b/test/confs/0418
@@ -1,12 +1,7 @@
 # Exim test configuration 0418
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0419 b/test/confs/0419
index 9fcf361db..39f634c63 100644
--- a/test/confs/0419
+++ b/test/confs/0419
@@ -1,12 +1,7 @@
 # Exim test configuration 0419
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0420 b/test/confs/0420
index 38cf50c22..a115c7249 100644
--- a/test/confs/0420
+++ b/test/confs/0420
@@ -1,19 +1,16 @@
 # Exim test configuration 0420
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
 primary_hostname = mail.test.ex
 qualify_domain = test.ex
 
+queue_only
 acl_smtp_rcpt = accept
+acl_smtp_data =	accept logwrite = h: <$h_Received:>
 
 received_header_text = ${if eq{$sender_address}{x@y}{}{Received: some text}}
 
diff --git a/test/confs/0421 b/test/confs/0421
index a65df5fdd..6d12ce20b 100644
--- a/test/confs/0421
+++ b/test/confs/0421
@@ -1,12 +1,7 @@
 # Exim test configuration 0421
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0422 b/test/confs/0422
index 5ad06071e..14255d621 100644
--- a/test/confs/0422
+++ b/test/confs/0422
@@ -1,12 +1,7 @@
 # Exim test configuration 0422
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0423 b/test/confs/0423
index 30ba84b82..3effe6cc4 100644
--- a/test/confs/0423
+++ b/test/confs/0423
@@ -1,12 +1,7 @@
 # Exim test configuration 0423
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0424 b/test/confs/0424
index 902f9ccb8..2ce709db0 100644
--- a/test/confs/0424
+++ b/test/confs/0424
@@ -1,12 +1,7 @@
 # Exim test configuration 0424
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0425 b/test/confs/0425
index 5c4378fea..6c9383a41 100644
--- a/test/confs/0425
+++ b/test/confs/0425
@@ -1,12 +1,7 @@
 # Exim test configuration 0425
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0426 b/test/confs/0426
index f50d54067..fbac9ecfd 100644
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -1,12 +1,7 @@
 # Exim test configuration 0426
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0427 b/test/confs/0427
index 95e6b5264..cdbc8ae3e 100644
--- a/test/confs/0427
+++ b/test/confs/0427
@@ -1,12 +1,7 @@
 # Exim test configuration 0427
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0428 b/test/confs/0428
index 0fb20a14a..38601f30b 100644
--- a/test/confs/0428
+++ b/test/confs/0428
@@ -1,12 +1,7 @@
 # Exim test configuration 0428
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0429 b/test/confs/0429
index 3dbf4fcb2..49df93001 100644
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -1,13 +1,8 @@
 # Exim test configuration 0429
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0430 b/test/confs/0430
index b38f3057b..552b0d010 100644
--- a/test/confs/0430
+++ b/test/confs/0430
@@ -3,14 +3,9 @@
 LIST=
 SELF=freeze
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0431 b/test/confs/0431
index 33b3631c3..7590fa9d4 100644
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -2,14 +2,9 @@
 
 AFFIX=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0432 b/test/confs/0432
index ffb97452f..e8e6e3552 100644
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -1,13 +1,8 @@
 # Exim test configuration 0432
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0433 b/test/confs/0433
index 4513f6db0..55fb85e96 100644
--- a/test/confs/0433
+++ b/test/confs/0433
@@ -4,14 +4,9 @@ PORT=
 IFACE=
 
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0434 b/test/confs/0434
index 5616b9cee..0d77fa095 100644
--- a/test/confs/0434
+++ b/test/confs/0434
@@ -2,14 +2,9 @@
 
 ELI=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0435 b/test/confs/0435
index b251a0120..21148174f 100644
--- a/test/confs/0435
+++ b/test/confs/0435
@@ -1,13 +1,8 @@
 # Exim test configuration 0435
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0436 b/test/confs/0436
index 9c24f1ff5..2fcaef961 100644
--- a/test/confs/0436
+++ b/test/confs/0436
@@ -1,13 +1,8 @@
 # Exim test configuration 0436
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0437 b/test/confs/0437
index 7e0583d79..d0ea77ea1 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 58d617824..bf1b55061 100644
--- a/test/confs/0438
+++ b/test/confs/0438
@@ -1,13 +1,8 @@
 # Exim test configuration 0438
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0439 b/test/confs/0439
index c63503634..feb42f596 100644
--- a/test/confs/0439
+++ b/test/confs/0439
@@ -1,13 +1,8 @@
 # Exim test configuration 0439
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0440 b/test/confs/0440
index 6a61c130a..2bef8c961 100644
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -1,13 +1,8 @@
 # Exim test configuration 0440
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0441 b/test/confs/0441
index 3e10aa309..71153a7fe 100644
--- a/test/confs/0441
+++ b/test/confs/0441
@@ -1,13 +1,8 @@
 # Exim test configuration 0441
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0442 b/test/confs/0442
index 29ecc1568..2e1b17dee 100644
--- a/test/confs/0442
+++ b/test/confs/0442
@@ -2,14 +2,9 @@
 
 BAD=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0443 b/test/confs/0443
index bd5dad286..154c8edba 100644
--- a/test/confs/0443
+++ b/test/confs/0443
@@ -1,13 +1,8 @@
 # Exim test configuration 0443
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0444 b/test/confs/0444
index f6dff0169..2c103ff69 100644
--- a/test/confs/0444
+++ b/test/confs/0444
@@ -1,13 +1,8 @@
 # Exim test configuration 0444
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0445 b/test/confs/0445
index 32d3c6544..f42606b12 100644
--- a/test/confs/0445
+++ b/test/confs/0445
@@ -1,13 +1,8 @@
 # Exim test configuration 0445
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0446 b/test/confs/0446
index 8adfcc6b1..90e8a0245 100644
--- a/test/confs/0446
+++ b/test/confs/0446
@@ -1,13 +1,8 @@
 # Exim test configuration 0446
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0447 b/test/confs/0447
index 112978f88..57b992d1b 100644
--- a/test/confs/0447
+++ b/test/confs/0447
@@ -2,14 +2,9 @@
 
 INSERT=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0448 b/test/confs/0448
index cccf16498..f18f8f539 100644
--- a/test/confs/0448
+++ b/test/confs/0448
@@ -1,13 +1,8 @@
 # Exim test configuration 0448
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0449 b/test/confs/0449
index 2d8c2f51e..d08da8341 100644
--- a/test/confs/0449
+++ b/test/confs/0449
@@ -1,13 +1,8 @@
 # Exim test configuration 0449
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0450 b/test/confs/0450
index 409098d30..2dff861a1 100644
--- a/test/confs/0450
+++ b/test/confs/0450
@@ -2,14 +2,9 @@
 
 EXTRA=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0451 b/test/confs/0451
index 6ae4d3c5e..7d25049d4 100644
--- a/test/confs/0451
+++ b/test/confs/0451
@@ -1,13 +1,8 @@
 # Exim test configuration 0451
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0452 b/test/confs/0452
index a8531320b..a94295a98 100644
--- a/test/confs/0452
+++ b/test/confs/0452
@@ -1,13 +1,8 @@
 # Exim test configuration 0452
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0453 b/test/confs/0453
index e4294aeb2..3ecc86591 100644
--- a/test/confs/0453
+++ b/test/confs/0453
@@ -2,14 +2,9 @@
 
 LIMIT=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0454 b/test/confs/0454
index bb4e8b79e..359d0d917 100644
--- a/test/confs/0454
+++ b/test/confs/0454
@@ -1,13 +1,8 @@
 # Exim test configuration 0454
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0455 b/test/confs/0455
index d6688d932..390c28a95 100644
--- a/test/confs/0455
+++ b/test/confs/0455
@@ -2,13 +2,8 @@
 
 HOSTS_MAX_TRY=4
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0456 b/test/confs/0456
index da9814360..362d6b549 100644
--- a/test/confs/0456
+++ b/test/confs/0456
@@ -2,13 +2,8 @@
 
 HOSTS_MAX_TRY=4
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0457 b/test/confs/0457
index c3538607e..866950e9a 100644
--- a/test/confs/0457
+++ b/test/confs/0457
@@ -1,12 +1,7 @@
 # Exim test configuration 0457
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0458 b/test/confs/0458
index bb6e4fcb3..e964cb0c7 100644
--- a/test/confs/0458
+++ b/test/confs/0458
@@ -1,13 +1,8 @@
 # Exim test configuration 0458
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0459 b/test/confs/0459
index f16dc0b3c..46d037557 100644
--- a/test/confs/0459
+++ b/test/confs/0459
@@ -1,13 +1,8 @@
 # Exim test configuration 0459
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0460 b/test/confs/0460
index aa53b9722..52628ab25 100644
--- a/test/confs/0460
+++ b/test/confs/0460
@@ -1,13 +1,8 @@
 # Exim test configuration 0460
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0461 b/test/confs/0461
index c78c2a94a..30abd50a9 100644
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -5,14 +5,9 @@ ROUTE_DATA=V4NET.0.0.1
 RETRY1=1s
 RETRY2=2s
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0462 b/test/confs/0462
index 9e602a57f..36d18412d 100644
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -2,14 +2,9 @@
 
 SELECTOR=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0463 b/test/confs/0463
index 187ea46fe..8be1d95c1 100644
--- a/test/confs/0463
+++ b/test/confs/0463
@@ -1,13 +1,8 @@
 # Exim test configuration 0463
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0464 b/test/confs/0464
index 8a484ee8f..21e41cb08 100644
--- a/test/confs/0464
+++ b/test/confs/0464
@@ -1,13 +1,8 @@
 # Exim test configuration 0464
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0465 b/test/confs/0465
index 877e04487..9fc5579df 100644
--- a/test/confs/0465
+++ b/test/confs/0465
@@ -1,15 +1,10 @@
 # Exim test configuration 0465
 
-STD=
+OPT=
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -17,7 +12,7 @@ acl_smtp_rcpt = accept
 acl_smtp_data = check_data
 queue_only
 trusted_users = CALLER
-STD
+OPT
 
 
 begin acl
diff --git a/test/confs/0466 b/test/confs/0466
index 8cd7d6036..880a41e33 100644
--- a/test/confs/0466
+++ b/test/confs/0466
@@ -1,13 +1,8 @@
 # Exim test configuration 0466
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0467 b/test/confs/0467
index 3d031a65d..147aca64e 100644
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -2,14 +2,9 @@
 
 SRV=smtp
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0468 b/test/confs/0468
index 0baf45ba6..c04a04e61 100644
--- a/test/confs/0468
+++ b/test/confs/0468
@@ -2,14 +2,9 @@
 
 SRV=smtp
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0469 b/test/confs/0469
index 51f5bdfcb..a008dde00 100644
--- a/test/confs/0469
+++ b/test/confs/0469
@@ -2,14 +2,9 @@
 
 SRV=smtp
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0470 b/test/confs/0470
index aff710724..a0f0b5027 100644
--- a/test/confs/0470
+++ b/test/confs/0470
@@ -2,14 +2,9 @@
 
 SRV=smtp
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0471 b/test/confs/0471
index bc6fd509f..f7e0a9f0b 100644
--- a/test/confs/0471
+++ b/test/confs/0471
@@ -1,13 +1,8 @@
 # Exim test configuration 0471
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0472 b/test/confs/0472
index b27bc6d8f..09d563329 100644
--- a/test/confs/0472
+++ b/test/confs/0472
@@ -2,14 +2,9 @@
 
 FUSER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0473 b/test/confs/0473
index e9ea69db6..6dd6b8898 100644
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -3,13 +3,8 @@
 USE_SENDER = ,use_sender
 ACL_RCPT = acl_rcpt
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0474 b/test/confs/0474
index 5a6ddc528..35b4805e5 100644
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -1,12 +1,7 @@
 # Exim test configuration 0474
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0475 b/test/confs/0475
index 048c69118..dfca55c78 100644
--- a/test/confs/0475
+++ b/test/confs/0475
@@ -1,12 +1,7 @@
 # Exim test configuration 0475
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0476 b/test/confs/0476
index 084184aad..fd6106b16 100644
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -1,12 +1,7 @@
 # Exim test configuration 0476
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0477 b/test/confs/0477
index 650552bb3..04d836591 100644
--- a/test/confs/0477
+++ b/test/confs/0477
@@ -1,12 +1,7 @@
 # Exim test configuration 0477
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0478 b/test/confs/0478
index f3e11de23..d9fd0a5ce 100644
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -2,13 +2,8 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0479 b/test/confs/0479
index 048edebd8..bfb9b8613 100644
--- a/test/confs/0479
+++ b/test/confs/0479
@@ -1,12 +1,7 @@
 # Exim test configuration 0479
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0480 b/test/confs/0480
index 0c0f2ca11..6c2b688ec 100644
--- a/test/confs/0480
+++ b/test/confs/0480
@@ -6,13 +6,8 @@ IP3=V4NET.0.0.3
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0481 b/test/confs/0481
index de976c5b5..ae1b78819 100644
--- a/test/confs/0481
+++ b/test/confs/0481
@@ -1,13 +1,8 @@
 # Exim test configuration 0481
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0482 b/test/confs/0482
index 20b06d88b..ba29b81db 100644
--- a/test/confs/0482
+++ b/test/confs/0482
@@ -1,13 +1,8 @@
 # Exim test configuration 0482
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0483 b/test/confs/0483
index 530253b15..e9c1f09e5 100644
--- a/test/confs/0483
+++ b/test/confs/0483
@@ -1,13 +1,8 @@
 # Exim test configuration 0483
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0484 b/test/confs/0484
index 3837a20ff..65ca274f2 100644
--- a/test/confs/0484
+++ b/test/confs/0484
@@ -1,13 +1,8 @@
 # Exim test configuration 0484
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0485 b/test/confs/0485
index 4b8a0dbb3..ad31830e0 100644
--- a/test/confs/0485
+++ b/test/confs/0485
@@ -1,13 +1,8 @@
 # Exim test configuration 0485
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0486 b/test/confs/0486
index 7104bb7f5..40c995112 100644
--- a/test/confs/0486
+++ b/test/confs/0486
@@ -1,13 +1,8 @@
 # Exim test configuration 0486
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0487 b/test/confs/0487
index 8776d80f1..a9c1babc0 100644
--- a/test/confs/0487
+++ b/test/confs/0487
@@ -1,13 +1,8 @@
 # Exim test configuration 0487
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0488 b/test/confs/0488
index e687e95e9..de7a7af29 100644
--- a/test/confs/0488
+++ b/test/confs/0488
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0489 b/test/confs/0489
index 7148b9cff..878565d21 100644
--- a/test/confs/0489
+++ b/test/confs/0489
@@ -1,13 +1,8 @@
 # Exim test configuration 0489
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0490 b/test/confs/0490
index 0252d2dec..ca3c1c2fe 100644
--- a/test/confs/0490
+++ b/test/confs/0490
@@ -1,13 +1,8 @@
 # Exim test configuration 0490
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0491 b/test/confs/0491
index 8a0f0e819..c7d3eaec0 100644
--- a/test/confs/0491
+++ b/test/confs/0491
@@ -3,14 +3,9 @@
 UL=abc@xyz
 REWRITE=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0492 b/test/confs/0492
index 0271d3b85..a939fe125 100644
--- a/test/confs/0492
+++ b/test/confs/0492
@@ -1,13 +1,8 @@
 # Exim test configuration 0492
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0493 b/test/confs/0493
index 314fe92a4..dd38fbc49 100644
--- a/test/confs/0493
+++ b/test/confs/0493
@@ -1,13 +1,8 @@
 # Exim test configuration 0493
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0494 b/test/confs/0494
index 98a9c3109..8027cf482 100644
--- a/test/confs/0494
+++ b/test/confs/0494
@@ -1,13 +1,8 @@
 # Exim test configuration 0494
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0495 b/test/confs/0495
index bb7c5e332..5bfec709f 100644
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -1,13 +1,8 @@
 # Exim test configuration 0495
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0496 b/test/confs/0496
index c30833d24..351cd802a 100644
--- a/test/confs/0496
+++ b/test/confs/0496
@@ -1,13 +1,8 @@
 # Exim test configuration 0496
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0497 b/test/confs/0497
index af8fc81dd..2154c3c2c 100644
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -1,13 +1,8 @@
 # Exim test configuration 0497
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0498 b/test/confs/0498
index f55a0ab75..c26f43a8a 100644
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -1,13 +1,8 @@
 # Exim test configuration 0498
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0499 b/test/confs/0499
index ff6d2aaea..b7a0b7980 100644
--- a/test/confs/0499
+++ b/test/confs/0499
@@ -1,13 +1,8 @@
 # Exim test configuration 0499
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0500 b/test/confs/0500
index f07b20893..f3b225c66 100644
--- a/test/confs/0500
+++ b/test/confs/0500
@@ -1,13 +1,8 @@
 # Exim test configuration 0500
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0501 b/test/confs/0501
index 5e18c7f73..f3085e839 100644
--- a/test/confs/0501
+++ b/test/confs/0501
@@ -1,13 +1,8 @@
 # Exim test configuration 0501
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0502 b/test/confs/0502
index a6ff74c40..d1314891d 100644
--- a/test/confs/0502
+++ b/test/confs/0502
@@ -2,14 +2,9 @@
 
 LAST=accept message = Your message here
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0503 b/test/confs/0503
index 6dccd559a..aab6cdb54 100644
--- a/test/confs/0503
+++ b/test/confs/0503
@@ -2,14 +2,9 @@
 
 MSIZE=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0504 b/test/confs/0504
index 86f599d95..b2dadfcb3 100644
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -1,13 +1,8 @@
 # Exim test configuration 0504
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0505 b/test/confs/0505
index 27ed59835..99b64bfa3 100644
--- a/test/confs/0505
+++ b/test/confs/0505
@@ -4,14 +4,9 @@ ACL=
 CONTROL=
 RECIPIENT=acl_smtp_rcpt=accept
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0506 b/test/confs/0506
index 22fdaa181..d20db5f2f 100644
--- a/test/confs/0506
+++ b/test/confs/0506
@@ -3,14 +3,9 @@
 ALLOW=allow_filter
 FORBID=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0507 b/test/confs/0507
index da500daf8..6449e056a 100644
--- a/test/confs/0507
+++ b/test/confs/0507
@@ -2,14 +2,9 @@
 
 ERROR_DETAILS=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0508 b/test/confs/0508
index c81919e7e..17a1dec10 100644
--- a/test/confs/0508
+++ b/test/confs/0508
@@ -1,13 +1,8 @@
 # Exim test configuration 0508
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0509 b/test/confs/0509
index c45f52d68..bc3dc50a8 100644
--- a/test/confs/0509
+++ b/test/confs/0509
@@ -1,13 +1,8 @@
 # Exim test configuration 0509
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0510 b/test/confs/0510
index 2a7ee7d6e..c73a1b402 100644
--- a/test/confs/0510
+++ b/test/confs/0510
@@ -1,13 +1,8 @@
 # Exim test configuration 0510
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/0511 b/test/confs/0511
index 685b1955b..1ecc19998 100644
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -1,13 +1,8 @@
 # Exim test configuration 0511
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0512 b/test/confs/0512
index 202acb29f..15e424a51 100644
--- a/test/confs/0512
+++ b/test/confs/0512
@@ -2,14 +2,9 @@
 
 HARDLIMIT=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0513 b/test/confs/0513
index ea76f3447..d449a81ea 100644
--- a/test/confs/0513
+++ b/test/confs/0513
@@ -2,14 +2,9 @@
 
 HARDLIMIT=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0514 b/test/confs/0514
index d52a76950..36a2ac3d2 100644
--- a/test/confs/0514
+++ b/test/confs/0514
@@ -1,13 +1,8 @@
 # Exim test configuration 0514
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0515 b/test/confs/0515
index ad262e774..c3f57ba2c 100644
--- a/test/confs/0515
+++ b/test/confs/0515
@@ -1,13 +1,8 @@
 # Exim test configuration 0515
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0516 b/test/confs/0516
index 2d5ea226a..78ebfd121 100644
--- a/test/confs/0516
+++ b/test/confs/0516
@@ -1,13 +1,8 @@
 # Exim test configuration 0516
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0517 b/test/confs/0517
index 52663742a..cbb2d4dbb 100644
--- a/test/confs/0517
+++ b/test/confs/0517
@@ -2,14 +2,9 @@
 
 ERROR_DETAILS=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0518 b/test/confs/0518
index 979f99adf..c413faa95 100644
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -1,13 +1,8 @@
 # Exim test configuration 0518
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0519 b/test/confs/0519
index 943c91818..e6dbb0090 100644
--- a/test/confs/0519
+++ b/test/confs/0519
@@ -1,13 +1,8 @@
 # Exim test configuration 0519
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0520 b/test/confs/0520
index f850c7c2f..1106fd896 100644
--- a/test/confs/0520
+++ b/test/confs/0520
@@ -1,13 +1,8 @@
 # Exim test configuration 0520
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0521 b/test/confs/0521
index fb47004fd..8c9c70042 100644
--- a/test/confs/0521
+++ b/test/confs/0521
@@ -1,13 +1,8 @@
 # Exim test configuration 0521
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0522 b/test/confs/0522
index 77f60c86a..4909db849 100644
--- a/test/confs/0522
+++ b/test/confs/0522
@@ -2,14 +2,9 @@
 
 TIMEOUTDEFER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0523 b/test/confs/0523
index c3d9e6dc5..9415855d7 100644
--- a/test/confs/0523
+++ b/test/confs/0523
@@ -1,13 +1,8 @@
 # Exim test configuration 0523
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0524 b/test/confs/0524
index 0d73654b2..a94122c38 100644
--- a/test/confs/0524
+++ b/test/confs/0524
@@ -1,13 +1,8 @@
 # Exim test configuration 0524
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0525 b/test/confs/0525
index 04a0211f4..a6e429172 100644
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -1,13 +1,8 @@
 # Exim test configuration 0525
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0526 b/test/confs/0526
index e4fabf60c..e2e927667 100644
--- a/test/confs/0526
+++ b/test/confs/0526
@@ -1,13 +1,8 @@
 # Exim test configuration 0526
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0527 b/test/confs/0527
index 57d51952e..2932f6907 100644
--- a/test/confs/0527
+++ b/test/confs/0527
@@ -1,13 +1,8 @@
 # Exim test configuration 0527
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0528 b/test/confs/0528
index a8de7aec8..e7313a5ca 100644
--- a/test/confs/0528
+++ b/test/confs/0528
@@ -1,13 +1,8 @@
 # Exim test configuration 0528
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0529 b/test/confs/0529
index 282047f9f..09e81d06e 100644
--- a/test/confs/0529
+++ b/test/confs/0529
@@ -1,13 +1,8 @@
 # Exim test configuration 0529
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0530 b/test/confs/0530
index c919cb658..9eeb4cc9f 100644
--- a/test/confs/0530
+++ b/test/confs/0530
@@ -1,13 +1,8 @@
 # Exim test configuration 0530
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0531 b/test/confs/0531
index a66723188..2f72810cf 100644
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -1,13 +1,8 @@
 # Exim test configuration 0531
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0532 b/test/confs/0532
index 4d45c2fd3..e50c5de0e 100644
--- a/test/confs/0532
+++ b/test/confs/0532
@@ -2,14 +2,9 @@
 
 CONNECTCOND=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0533 b/test/confs/0533
index b0a3347b6..1dbc83b61 100644
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -1,13 +1,8 @@
 # Exim test configuration 0533
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0534 b/test/confs/0534
index d2bc84a76..db19f253a 100644
--- a/test/confs/0534
+++ b/test/confs/0534
@@ -1,13 +1,8 @@
 # Exim test configuration 0534
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0535 b/test/confs/0535
index 58cb1c425..004f795f5 100644
--- a/test/confs/0535
+++ b/test/confs/0535
@@ -1,13 +1,8 @@
 # Exim test configuration 0535
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0536 b/test/confs/0536
index 0582f6fb1..e451f81fe 100644
--- a/test/confs/0536
+++ b/test/confs/0536
@@ -2,14 +2,9 @@
 
 FORBID_SMTP_CODE = false
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0537 b/test/confs/0537
index 7a2ac9276..2498dc3ce 100644
--- a/test/confs/0537
+++ b/test/confs/0537
@@ -2,15 +2,10 @@
 
 TRUSTED=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +smtp_mailauth
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0538 b/test/confs/0538
index 6fbeeb23a..9081aa572 100644
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -1,13 +1,8 @@
 # Exim test configuration 0538
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0539 b/test/confs/0539
index e70a452f1..2ca8e253a 100644
--- a/test/confs/0539
+++ b/test/confs/0539
@@ -1,13 +1,8 @@
 # Exim test configuration 0539
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0540 b/test/confs/0540
index b5e183638..7ebbdd2b4 100644
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -1,13 +1,8 @@
 # Exim test configuration 0540
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0541 b/test/confs/0541
index d1b8f601b..73e8284d9 100644
--- a/test/confs/0541
+++ b/test/confs/0541
@@ -1,13 +1,8 @@
 # Exim test configuration 0541
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0542 b/test/confs/0542
index 1f22fe0d5..ca824d5c1 100644
--- a/test/confs/0542
+++ b/test/confs/0542
@@ -1,13 +1,8 @@
 # Exim test configuration 0542
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0543 b/test/confs/0543
index dcfcd303a..88e74e58f 100644
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -1,12 +1,7 @@
 # Exim test configuration 0543
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0544 b/test/confs/0544
index b5c9d73cf..09949a3fa 100644
--- a/test/confs/0544
+++ b/test/confs/0544
@@ -1,12 +1,7 @@
 # Exim test configuration 0544
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0545 b/test/confs/0545
index 86501e32c..a78236a4a 100644
--- a/test/confs/0545
+++ b/test/confs/0545
@@ -1,12 +1,7 @@
 # Exim test configuration 0545
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0546 b/test/confs/0546
index 7de92304c..2d5cae7b3 100644
--- a/test/confs/0546
+++ b/test/confs/0546
@@ -3,13 +3,8 @@
 HELO_MSG=One line
 RCPT_MSG=RCPT is OK
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0547 b/test/confs/0547
index e8e8eedd4..5d172447e 100644
--- a/test/confs/0547
+++ b/test/confs/0547
@@ -2,14 +2,9 @@
 
 MAXNM = 100
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0548 b/test/confs/0548
index faa1ffad3..3e1f0ebfc 100644
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -2,13 +2,8 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0549 b/test/confs/0549
index fd07a54ed..f3da5f486 100644
--- a/test/confs/0549
+++ b/test/confs/0549
@@ -1,13 +1,8 @@
 # Exim test configuration 0549
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0550 b/test/confs/0550
index f35ca9f67..caf3ceda7 100644
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -1,13 +1,8 @@
 # Exim test configuration 0550
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0551 b/test/confs/0551
index 102f4ceeb..1b4465bdd 100644
--- a/test/confs/0551
+++ b/test/confs/0551
@@ -1,19 +1,14 @@
 # Exim test configuration 0551
 
-LS=+pid
+LOG_SELECTOR=+pid
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
-log_selector = LS
+log_selector = LOG_SELECTOR
 
 # ----- Routers -----
 
diff --git a/test/confs/0552 b/test/confs/0552
index 9653e807e..c4c2f5e98 100644
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -3,14 +3,9 @@
 DDF=
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0553 b/test/confs/0553
index 36c5c8748..c9ceaa59e 100644
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -3,14 +3,9 @@
 DCF =
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0554 b/test/confs/0554
index fc7c986a6..cbcd357a9 100644
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -1,13 +1,8 @@
 # Exim test configuration 0554
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0555 b/test/confs/0555
index 2dbfa9da1..c86050fa6 100644
--- a/test/confs/0555
+++ b/test/confs/0555
@@ -2,14 +2,9 @@
 
 FAKE=fakereject
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0556 b/test/confs/0556
index 81fc19593..965d68120 100644
--- a/test/confs/0556
+++ b/test/confs/0556
@@ -5,14 +5,9 @@ ACL_RCPT=accept
 ACL_PREDATA=accept
 PAH=127.0.0.1
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0557 b/test/confs/0557
index 3c5d55197..9b7dec2e6 100644
--- a/test/confs/0557
+++ b/test/confs/0557
@@ -1,18 +1,13 @@
 # Exim test configuration 0557
 
-X=
-Y=
+FAKE=
+OPT=
 HOSTS=
 HAI=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -24,8 +19,8 @@ begin routers
 r1:
   driver = manualroute
   route_list = * HOSTS
-X host_find_failed = ignore
-Y host_all_ignored = HAI
+FAKE host_find_failed = ignore
+OPT  host_all_ignored = HAI
   no_more
   self = send
   transport = t1
diff --git a/test/confs/0558 b/test/confs/0558
index 13159ad37..c163cf37c 100644
--- a/test/confs/0558
+++ b/test/confs/0558
@@ -1,13 +1,8 @@
 # Exim test configuration 0558
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0559 b/test/confs/0559
index e97c8bb41..7f0107b15 100644
--- a/test/confs/0559
+++ b/test/confs/0559
@@ -1,13 +1,8 @@
 # Exim test configuration 0559
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0560 b/test/confs/0560
index edea9c30b..da6e7decd 100644
--- a/test/confs/0560
+++ b/test/confs/0560
@@ -1,13 +1,8 @@
 # Exim test configuration 0560
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0561 b/test/confs/0561
index c36031cf8..5ccf4dcc3 100644
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -2,14 +2,9 @@
 
 QOLL=true
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0562 b/test/confs/0562
index 3b478c1c9..d79c8bb07 100644
--- a/test/confs/0562
+++ b/test/confs/0562
@@ -1,13 +1,8 @@
 # Exim test configuration 0562
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0563 b/test/confs/0563
index 62249b8ca..c03254821 100644
--- a/test/confs/0563
+++ b/test/confs/0563
@@ -1,8 +1,10 @@
 # Exim test configuration 0563
 
+exim_path = EXIM_PATH
 tls_advertise_hosts =
 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 d9530e69a..6a23896ef 100644
--- a/test/confs/0564
+++ b/test/confs/0564
@@ -1,11 +1,13 @@
 # Exim test configuration 0564
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+chunking_advertise_hosts =
 tls_advertise_hosts =
 
 # ----- Main settings -----
diff --git a/test/confs/0565 b/test/confs/0565
index 397536342..0d053a080 100644
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -1,13 +1,8 @@
 # Exim test configuration 0565
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0566 b/test/confs/0566
index e4433f8f8..cc661f78b 100644
--- a/test/confs/0566
+++ b/test/confs/0566
@@ -1,14 +1,9 @@
 # Exim test configuration 0566
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +8bitmime
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/0567 b/test/confs/0567
index e6850b8bd..267566561 100644
--- a/test/confs/0567
+++ b/test/confs/0567
@@ -2,14 +2,9 @@
 
 CONNECTCOND=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0569 b/test/confs/0569
index e6ab3f692..3d562b6e7 100644
--- a/test/confs/0569
+++ b/test/confs/0569
@@ -1,13 +1,8 @@
 # Exim test configuration 0569
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0570 b/test/confs/0570
index eb7218138..1c2ca0a25 100644
--- a/test/confs/0570
+++ b/test/confs/0570
@@ -3,13 +3,8 @@
 
 OPTION =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0571 b/test/confs/0571
index 64383cdd8..cf4881a0a 100644
--- a/test/confs/0571
+++ b/test/confs/0571
@@ -2,14 +2,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0572 b/test/confs/0572
index 2cce49c38..23da35a09 100644
--- a/test/confs/0572
+++ b/test/confs/0572
@@ -2,14 +2,9 @@
 
 OPT =
 
-exim_path = EXIM_PATH
-hide host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -28,7 +23,7 @@ my_main_router:
   route_list = * 127.0.0.1
   self = send
   transport = my_smtp
-  debug_print = router_name <$router_name>
+  hide debug_print = router_name <$router_name>
   no_more
 
 
@@ -40,7 +35,6 @@ my_smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
-  hide socks_proxy = 127.0.0.1 port=PORT_D OPT
   debug_print = transport_name <$transport_name>
 
 
diff --git a/test/confs/0573 b/test/confs/0573
index c3c7a6bea..3c2b1aae1 100644
--- a/test/confs/0573
+++ b/test/confs/0573
@@ -1,13 +1,8 @@
 # Exim test configuration 0573
 
-exim_path = EXIM_PATH
-hide host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0574 b/test/confs/0574
new file mode 100644
index 000000000..9afc55247
--- /dev/null
+++ b/test/confs/0574
@@ -0,0 +1,28 @@
+# Exim test configuration 0574
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+acl_smtp_mail = chk_mail
+acl_smtp_rcpt = chk_rcpt
+acl_smtp_data = chk_data
+
+queue_only
+
+# ----- ACL -----
+
+begin acl
+
+chk_mail:
+  accept control = debug/tag=_1
+
+chk_rcpt:
+  accept control = debug/kill
+
+chk_data:
+  accept control = debug/tag=_2/opts=+all
+
+# End
diff --git a/test/confs/0575 b/test/confs/0575
new file mode 100644
index 000000000..e99bba917
--- /dev/null
+++ b/test/confs/0575
@@ -0,0 +1,13 @@
+# Exim test configuration 0575
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+primary_hostname = mail.test.ex
+qualify_domain = test.ex
+
+acl_smtp_rcpt = accept
+
+# End
diff --git a/test/confs/0576 b/test/confs/0576
new file mode 100644
index 000000000..b75b67804
--- /dev/null
+++ b/test/confs/0576
@@ -0,0 +1,39 @@
+# Exim test configuration 0576
+
+SERVER =
+
+.include DIR/aux-var/std_conf_prefix
+
+log_selector = +received_recipients +sender_on_delivery
+
+acl_smtp_rcpt = rcpt
+queue_only
+queue_run_in_order
+
+#---------------
+
+begin acl
+
+rcpt:
+  accept
+    queue = ${if eq {normal}{$local_part} {} {$local_part}}
+    logwrite = using queue '$queue_name'
+
+#---------------
+
+begin routers
+
+all:
+  driver = accept
+  transport = dump
+
+#---------------
+
+begin transports
+
+dump:
+  driver = pipe
+  command = true
+
+# End
+
diff --git a/test/confs/0600 b/test/confs/0600
index 671925956..29bc5bf1a 100644
--- a/test/confs/0600
+++ b/test/confs/0600
@@ -1,13 +1,8 @@
 # Exim test configuration 0600
 # utf8clean:string
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/0601 b/test/confs/0601
index abcaf1c58..faf44ce98 100644
--- a/test/confs/0601
+++ b/test/confs/0601
@@ -2,6 +2,7 @@
 # udpsend
 
 exim_path = EXIM_PATH
+keep_environment =
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 tls_advertise_hosts =
diff --git a/test/confs/0602 b/test/confs/0602
index 92ab4669c..12a789d12 100644
--- a/test/confs/0602
+++ b/test/confs/0602
@@ -1,11 +1,6 @@
 # Exim test configuration 0602
 
-exim_path = EXIM_PATH
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 # ----- Main settings -----
 
diff --git a/test/confs/0603 b/test/confs/0603
index 76bd41c55..baa3ea08c 100644
--- a/test/confs/0603
+++ b/test/confs/0603
@@ -7,16 +7,10 @@ untrusted_set_sender = *
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-#primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
 log_selector = +sender_on_delivery
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -49,7 +43,8 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
-  interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{127.0.0.2}}
+  # assumes that HOSTIPV4 can send to 127.0.0.1
+  interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
 
 # ----- Retry -----
 
diff --git a/test/confs/0604 b/test/confs/0604
index 6dcfba358..ec5195511 100644
--- a/test/confs/0604
+++ b/test/confs/0604
@@ -6,16 +6,10 @@ untrusted_set_sender = *
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-#primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
 log_selector = +sender_on_delivery
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -48,7 +42,8 @@ send_to_server:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
-  interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{127.0.0.2}}
+  # assumes that HOSTIPV4 can sent to 127.0.0.1
+  interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
 
 # ----- Retry -----
 
diff --git a/test/confs/0605 b/test/confs/0605
index 44ccb63c7..2b5185c57 100644
--- a/test/confs/0605
+++ b/test/confs/0605
@@ -1,12 +1,6 @@
 # Exim test configuration 0605
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 # ----- Main settings -----
 
diff --git a/test/confs/0606 b/test/confs/0606
index bb94edb29..25706976a 100644
--- a/test/confs/0606
+++ b/test/confs/0606
@@ -1,12 +1,6 @@
 # Exim test configuration 0606
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 slow_lookup_log = 1000
 
diff --git a/test/confs/0607 b/test/confs/0607
index 932ae4c67..03c052316 100644
--- a/test/confs/0607
+++ b/test/confs/0607
@@ -2,13 +2,7 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 log_selector = +received_recipients +sender_on_delivery
 
diff --git a/test/confs/0608 b/test/confs/0608
index b88f32e12..0ca40c770 100644
--- a/test/confs/0608
+++ b/test/confs/0608
@@ -1,13 +1,8 @@
 # Exim test configuration 0608
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0609 b/test/confs/0609
index 2b2f25d2b..e1ec0853e 100644
--- a/test/confs/0609
+++ b/test/confs/0609
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0610 b/test/confs/0610
index a68b4ebee..0567d8aaf 100644
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -2,16 +2,10 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-#primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
 log_selector = +sender_on_delivery
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -54,7 +48,7 @@ t2:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
-  interface = 127.0.0.2
+  interface = HOSTIPV4
 
 # ----- Retry -----
 
diff --git a/test/confs/0611 b/test/confs/0611
index b52639198..4f6f490d3 100644
--- a/test/confs/0611
+++ b/test/confs/0611
@@ -4,12 +4,14 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 tls_advertise_hosts =
+chunking_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0612 b/test/confs/0612
index 3439ecb84..44f2e74d6 100644
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -1,14 +1,9 @@
 # Exim test configuration 0612
 # log_defer_output on pipe transport
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0613 b/test/confs/0613
index a5ec4f856..5094759eb 100644
--- a/test/confs/0613
+++ b/test/confs/0613
@@ -1,14 +1,9 @@
 # Exim test configuration 0613
 # manualroute, hosts_randomize and multiple recipients
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0614 b/test/confs/0614
index 2b2361747..d19be4e74 100644
--- a/test/confs/0614
+++ b/test/confs/0614
@@ -1,14 +1,9 @@
 # Exim test configuration 0614
 # hosts_connection_nolog versus sender_host lists caching
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/0900 b/test/confs/0900
new file mode 100644
index 000000000..e02380f73
--- /dev/null
+++ b/test/confs/0900
@@ -0,0 +1,120 @@
+# Exim test configuration 0900
+SERVER=
+SRV=
+LIST=
+ALLOW=
+
+exim_path = EXIM_PATH
+keep_environment =
+host_lookup_order = bydns
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/SERVER%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts = *
+tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
+
+
+# ----- Main settings -----
+
+primary_hostname = testhost.test.ex
+domainlist local_domains = @ : test.ex
+
+acl_smtp_rcpt = check_recipient
+acl_smtp_data_prdr = check_prdr
+acl_smtp_data = check_data
+trusted_users = CALLER
+queue_only
+smtp_receive_timeout = 2s
+log_selector = +received_recipients
+
+.ifdef _OPT_MAIN_TLS_CERTIFICATE
+tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+.endif
+
+ALLOW
+
+# ----- ACL -----
+
+begin acl
+
+check_recipient:
+  accept hosts = :
+  accept domains = +local_domains
+  deny   message = relay not permitted
+
+check_prdr:
+  accept local_parts = good
+  deny
+
+check_data:
+  warn   message = X-acl-message-linecount: $message_linecount
+  accept
+
+# ----- Routers -----
+
+begin routers
+
+to_server:
+  driver = accept
+  condition =	${if !eq {SERVER}{server}}
+  transport =	remote_smtp${if eq {OPT}{dkim} {_dkim}}
+  errors_to =	""
+
+fail_remote_domains:
+  driver = redirect
+  domains = ! +local_domains
+  data = :fail: unrouteable mail domain "$domain"
+
+localuser:
+  driver = accept
+  check_local_user
+  transport = local_delivery
+  headers_add = X-local-user: uid=$local_user_uid gid=$local_user_gid
+
+
+# ----- Transports -----
+
+begin transports
+
+local_delivery:
+  driver = appendfile
+  delivery_date_add
+  envelope_to_add
+  file = DIR/test-mail/$local_part
+  headers_add = "X-body-linecount: $body_linecount\n\
+                 X-message-linecount: $message_linecount\n\
+                 X-received-count: $received_count"
+  return_path_add
+
+remote_smtp:
+  driver = smtp
+  hosts =	127.0.0.1
+  port =	PORT_S
+  allow_localhost
+  command_timeout = 2s
+  final_timeout = 2s
+
+remote_smtp_dkim:
+  driver = smtp
+  hosts =	127.0.0.1
+  port =	PORT_S
+  allow_localhost
+  command_timeout = 2s
+  final_timeout = 2s
+
+.ifdef OPT
+  dkim_domain =		test.ex
+  dkim_selector =	sel
+  dkim_private_key =	DIR/aux-fixed/dkim/dkim.private
+.ifndef HEADERS_MAXSIZE
+  dkim_sign_headers =	LIST
+.endif
+.endif
+
+# ----- Retry -----
+
+begin retry
+* * F,30m,5m;
+# End
diff --git a/test/confs/0901 b/test/confs/0901
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/0901
@@ -0,0 +1 @@
+0900
+\ No newline at end of file
diff --git a/test/confs/0902 b/test/confs/0902
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/0902
@@ -0,0 +1 @@
+0900
+\ No newline at end of file
diff --git a/test/confs/1000 b/test/confs/1000
index b05acde77..f27d4ff6f 100644
--- a/test/confs/1000
+++ b/test/confs/1000
@@ -2,14 +2,9 @@
 
 HL=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/1001 b/test/confs/1001
index 49d367d7b..e4ed6779b 100644
--- a/test/confs/1001
+++ b/test/confs/1001
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/1002 b/test/confs/1002
index 8210a10f3..f0a4518f3 100644
--- a/test/confs/1002
+++ b/test/confs/1002
@@ -1,13 +1,8 @@
 # Exim test configuration 1002
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/1003 b/test/confs/1003
index 386ebb30c..bdbd2e6c3 100644
--- a/test/confs/1003
+++ b/test/confs/1003
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/1005 b/test/confs/1005
index d19571b82..35767932d 100644
--- a/test/confs/1005
+++ b/test/confs/1005
@@ -1,12 +1,7 @@
 # Exim test configuration 1005
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/1006 b/test/confs/1006
index e053d1b09..f46fba932 100644
--- a/test/confs/1006
+++ b/test/confs/1006
@@ -3,14 +3,9 @@
 SERVER=
 D6=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/1007 b/test/confs/1007
index 2bcd150a9..3f354f9c9 100644
--- a/test/confs/1007
+++ b/test/confs/1007
@@ -4,14 +4,9 @@ PORT=
 IFACE=
 
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/1008 b/test/confs/1008
index cc76315ef..e3307044f 100644
--- a/test/confs/1008
+++ b/test/confs/1008
@@ -1,12 +1,7 @@
 # Exim test configuration 1008
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/1009 b/test/confs/1009
index 99b78d9c1..af6e27642 100644
--- a/test/confs/1009
+++ b/test/confs/1009
@@ -1,12 +1,7 @@
 # Exim test configuration 1009
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/1010 b/test/confs/1010
index fde1f7539..2f2456bc2 100644
--- a/test/confs/1010
+++ b/test/confs/1010
@@ -1,13 +1,8 @@
 # Exim test configuration 1010
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2000 b/test/confs/2000
index 7a2d34b2f..9ca325f2a 100644
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2001 b/test/confs/2001
index e2572df3a..9ab4cc384 100644
--- a/test/confs/2001
+++ b/test/confs/2001
@@ -3,13 +3,9 @@
 OPTION=
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2002 b/test/confs/2002
index 76e6f1eec..535be91eb 100644
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -1,13 +1,9 @@
 # Exim test configuration 2002
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+
 timezone = UTC
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/2003 b/test/confs/2003
index 8631514b8..c3eece620 100644
--- a/test/confs/2003
+++ b/test/confs/2003
@@ -1,12 +1,8 @@
 # Exim test configuration 2003
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2004 b/test/confs/2004
index 2979685ec..4cd622cef 100644
--- a/test/confs/2004
+++ b/test/confs/2004
@@ -1,12 +1,8 @@
 # Exim test configuration 2004
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2005 b/test/confs/2005
index 5b57b60ff..110bbef22 100644
--- a/test/confs/2005
+++ b/test/confs/2005
@@ -1,12 +1,8 @@
 # Exim test configuration 2005
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2006 b/test/confs/2006
index 8c1a13da2..63ed36a4e 100644
--- a/test/confs/2006
+++ b/test/confs/2006
@@ -1,12 +1,8 @@
 # Exim test configuration 2006
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2007 b/test/confs/2007
index 5bdf76f03..7b58b73ee 100644
--- a/test/confs/2007
+++ b/test/confs/2007
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2008 b/test/confs/2008
index 4bad74a1b..83b30502a 100644
--- a/test/confs/2008
+++ b/test/confs/2008
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 
 # ----- Main settings -----
diff --git a/test/confs/2009 b/test/confs/2009
index 66fadea29..59139f27e 100644
--- a/test/confs/2009
+++ b/test/confs/2009
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2010 b/test/confs/2010
index 34383c25a..2cedb89cf 100644
--- a/test/confs/2010
+++ b/test/confs/2010
@@ -4,13 +4,9 @@ SERVER =
 TIMES =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2012 b/test/confs/2012
index 59265d407..8fbc55595 100644
--- a/test/confs/2012
+++ b/test/confs/2012
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com
diff --git a/test/confs/2013 b/test/confs/2013
index 331dd09ef..ebd253691 100644
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2014 b/test/confs/2014
index 562e916fd..f9e2e6a22 100644
--- a/test/confs/2014
+++ b/test/confs/2014
@@ -2,13 +2,9 @@
 
 CRL=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2015 b/test/confs/2015
index 734c2834a..e17fc29e9 100644
--- a/test/confs/2015
+++ b/test/confs/2015
@@ -1,12 +1,8 @@
 # Exim test configuration 2015
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2016 b/test/confs/2016
index ef6e14463..b14e1f300 100644
--- a/test/confs/2016
+++ b/test/confs/2016
@@ -1,12 +1,7 @@
 # Exim test configuration 2016
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/2017 b/test/confs/2017
index 26b257cd5..a699f2d78 100644
--- a/test/confs/2017
+++ b/test/confs/2017
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2018 b/test/confs/2018
index 4afe33b96..58c1219e5 100644
--- a/test/confs/2018
+++ b/test/confs/2018
@@ -1,12 +1,8 @@
 # Exim test configuration 2018
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2019 b/test/confs/2019
index 798eb73d7..fdc030c23 100644
--- a/test/confs/2019
+++ b/test/confs/2019
@@ -1,12 +1,8 @@
 # Exim test configuration 2019
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2020 b/test/confs/2020
index 7bde46415..5ec250ecd 100644..120000
--- a/test/confs/2020
+++ b/test/confs/2020
@@ -1,51 +1 @@
-# Exim test configuration 2020
-
-SERVER=
-
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
-
-log_selector = +tls_peerdn
-
-queue_only
-queue_run_in_order
-
-tls_advertise_hosts = *
-
-
-# ----- Routers -----
-
-begin routers
-
-abc:
-  driver = accept
-  transport = t1
-
-
-# ----- Transports -----
-
-begin transports
-
-t1:
-  driver = smtp
-  hosts = 127.0.0.1
-  allow_localhost
-  port = PORT_D
-
-
-# ----- Retry -----
-
-begin retry
-
-* * F,1d,1d
-
-# End
+2120
+\ No newline at end of file
diff --git a/test/confs/2021 b/test/confs/2021
index 97b98d6ad..ccd201719 100644
--- a/test/confs/2021
+++ b/test/confs/2021
@@ -3,14 +3,9 @@
 REQUIRE=#
 TRYCLEAR=#
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2022 b/test/confs/2022
index d11dd5e9e..47892ceb5 100644
--- a/test/confs/2022
+++ b/test/confs/2022
@@ -1,12 +1,8 @@
 # Exim test configuration 2022
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2023 b/test/confs/2023
index 849840404..9f1630929 100644
--- a/test/confs/2023
+++ b/test/confs/2023
@@ -1,12 +1,8 @@
 # Exim test configuration 2023
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2024 b/test/confs/2024
index 438899444..64502d56b 100644
--- a/test/confs/2024
+++ b/test/confs/2024
@@ -3,13 +3,9 @@
 CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2025 b/test/confs/2025
index ccb56dcb2..feaa815a1 100644
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2026 b/test/confs/2026
index 38900bb53..7da11a528 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
 spool_directory = DIR/spool
diff --git a/test/confs/2027 b/test/confs/2027
index bd15ea944..cc47218fb 100644
--- a/test/confs/2027
+++ b/test/confs/2027
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2028 b/test/confs/2028
index 38c14f249..68ca077be 100644
--- a/test/confs/2028
+++ b/test/confs/2028
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2029 b/test/confs/2029
index b98cf7348..40c56f0c2 100644
--- a/test/confs/2029
+++ b/test/confs/2029
@@ -1,12 +1,8 @@
 # Exim test configuration 2029
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2030 b/test/confs/2030
index e89e1c99f..e2ee0e223 100644
--- a/test/confs/2030
+++ b/test/confs/2030
@@ -3,14 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/2031 b/test/confs/2031
index 5791316c1..38713735b 100644
--- a/test/confs/2031
+++ b/test/confs/2031
@@ -3,14 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/2032 b/test/confs/2032
index 002c31391..9f69adca2 100644
--- a/test/confs/2032
+++ b/test/confs/2032
@@ -1,12 +1,8 @@
 # Exim test configuration 2032 (close copy of 2002)
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2033 b/test/confs/2033
index 9ed671172..73dcde61e 100644
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com
diff --git a/test/confs/2034 b/test/confs/2034
new file mode 120000
index 000000000..6d0f5c2f1
--- /dev/null
+++ b/test/confs/2034
@@ -0,0 +1 @@
+2006
+\ No newline at end of file
diff --git a/test/confs/2051 b/test/confs/2051
new file mode 120000
index 000000000..cde0a73c4
--- /dev/null
+++ b/test/confs/2051
@@ -0,0 +1 @@
+2151
+\ No newline at end of file
diff --git a/test/confs/2052 b/test/confs/2052
new file mode 100644
index 000000000..fd1f4d1c0
--- /dev/null
+++ b/test/confs/2052
@@ -0,0 +1,67 @@
+# Exim test configuration 2052
+# as per 2000 but with TCP Fast Open
+
+SERVER=
+
+.include DIR/aux-var/tls_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+
+log_selector =  +tls_peerdn
+
+queue_only
+queue_run_in_order
+
+tls_advertise_hosts = *
+# needed to force generation
+tls_dhparam = historic
+
+# Set certificate only if server
+
+tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+
+tls_verify_hosts = *
+tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+
+
+# ----- Routers -----
+
+begin routers
+
+client:
+  driver = accept
+  condition = ${if eq {SERVER}{server}{no}{yes}}
+  retry_use_local_part
+  transport = send_to_server
+
+
+# ----- Transports -----
+
+begin transports
+
+send_to_server:
+  driver = smtp
+  allow_localhost
+  hosts = 127.0.0.1
+  port = PORT_D
+  hosts_try_fastopen = *
+  tls_certificate = DIR/aux-fixed/cert2
+  tls_privatekey = DIR/aux-fixed/cert2
+  tls_verify_certificates = DIR/aux-fixed/cert2
+  tls_try_verify_hosts =
+
+
+# ----- Retry -----
+
+
+begin retry
+
+* * F,5d,10s
+
+
+# End
diff --git a/test/confs/2090 b/test/confs/2090
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/2090
@@ -0,0 +1 @@
+0900
+\ No newline at end of file
diff --git a/test/confs/2091 b/test/confs/2091
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/2091
@@ -0,0 +1 @@
+0900
+\ No newline at end of file
diff --git a/test/confs/2100 b/test/confs/2100
index dc8ec61ac..bce339b19 100644
--- a/test/confs/2100
+++ b/test/confs/2100
@@ -2,14 +2,13 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
+.ifdef _HAVE_TLS
+# that was purely to trigger the lazy-create of builtin macros
+.endif
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
diff --git a/test/confs/2101 b/test/confs/2101
index a8de8c06d..a0e1fe46f 100644
--- a/test/confs/2101
+++ b/test/confs/2101
@@ -3,13 +3,9 @@
 OPTION=
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2102 b/test/confs/2102
index 1de92e962..4223430a3 100644
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -1,13 +1,9 @@
 # Exim test configuration 2102
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+
 timezone = UTC
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/2103 b/test/confs/2103
index a9bc0ea7f..a9daf05b7 100644
--- a/test/confs/2103
+++ b/test/confs/2103
@@ -1,12 +1,8 @@
 # Exim test configuration 2103
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2104 b/test/confs/2104
index 610a5b722..7cd35f0e2 100644
--- a/test/confs/2104
+++ b/test/confs/2104
@@ -1,12 +1,8 @@
 # Exim test configuration 2104
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2105 b/test/confs/2105
index ec364a3c3..c77c1547f 100644
--- a/test/confs/2105
+++ b/test/confs/2105
@@ -1,12 +1,8 @@
 # Exim test configuration 2105
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2106 b/test/confs/2106
index d8c685eb5..56d8d6a3d 100644
--- a/test/confs/2106
+++ b/test/confs/2106
@@ -1,12 +1,8 @@
 # Exim test configuration 2106
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2107 b/test/confs/2107
index b1e1967b7..9487445cc 100644
--- a/test/confs/2107
+++ b/test/confs/2107
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2108 b/test/confs/2108
index 0388d0cc6..f09213be9 100644
--- a/test/confs/2108
+++ b/test/confs/2108
@@ -2,14 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/2109 b/test/confs/2109
index 3e151936f..8703d1967 100644
--- a/test/confs/2109
+++ b/test/confs/2109
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2110 b/test/confs/2110
index db6864863..72754a6d9 100644
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -3,13 +3,9 @@
 SERVER =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2111 b/test/confs/2111
index 9abfc7a1a..0d99a23bc 100644
--- a/test/confs/2111
+++ b/test/confs/2111
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -52,6 +48,6 @@ send_to_server:
   tls_certificate = DIR/aux-fixed/cert2
   tls_privatekey = DIR/aux-fixed/cert2
   tls_require_ciphers = IDEA-CBC-MD5 \
-    ${if eq{$host_address}{127.0.0.1}{:DES-CBC3-SHA:RSA_ARCFOUR_SHA}}
+    ${if eq{$host_address}{127.0.0.1}{:AES256-SHA:RSA_ARCFOUR_SHA}}
 
 # End
diff --git a/test/confs/2112 b/test/confs/2112
index 18b2fd780..aab264820 100644
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com
diff --git a/test/confs/2113 b/test/confs/2113
index d9ac50447..f2c49c9b8 100644
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2114 b/test/confs/2114
index a2b1c526f..398e2135d 100644
--- a/test/confs/2114
+++ b/test/confs/2114
@@ -2,13 +2,9 @@
 
 CRL=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2115 b/test/confs/2115
index 8142100aa..ab1f6dcdd 100644
--- a/test/confs/2115
+++ b/test/confs/2115
@@ -1,12 +1,8 @@
 # Exim test configuration 2115
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2116 b/test/confs/2116
index fbfb6dc56..d57d3a112 100644
--- a/test/confs/2116
+++ b/test/confs/2116
@@ -1,12 +1,7 @@
 # Exim test configuration 2116
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/2117 b/test/confs/2117
index 8bf80f2b8..b6a557667 100644
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2118 b/test/confs/2118
index 7ddc16140..d3e77201d 100644
--- a/test/confs/2118
+++ b/test/confs/2118
@@ -1,12 +1,8 @@
 # Exim test configuration 2118
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2119 b/test/confs/2119
index 7d382d9ac..26ae4c1bc 100644
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -1,12 +1,8 @@
 # Exim test configuration 2119
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2120 b/test/confs/2120
index c0225e819..1288d7f12 100644
--- a/test/confs/2120
+++ b/test/confs/2120
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
+.include DIR/aux-var/tls_conf_prefix
+
+primary_hostname = thishost.test.ex
 
 # ----- Main settings -----
 
@@ -37,7 +33,7 @@ begin transports
 
 t1:
   driver = smtp
-  hosts = 127.0.0.1
+  hosts = thishost.test.ex
   allow_localhost
   port = PORT_D
 
diff --git a/test/confs/2121 b/test/confs/2121
index c9a28c987..573ea379a 100644
--- a/test/confs/2121
+++ b/test/confs/2121
@@ -3,14 +3,9 @@
 REQUIRE=#
 TRYCLEAR=#
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2122 b/test/confs/2122
index 510efdaab..154603d5d 100644
--- a/test/confs/2122
+++ b/test/confs/2122
@@ -1,12 +1,8 @@
 # Exim test configuration 2122
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2123 b/test/confs/2123
index 6170caaa8..8c89e9aae 100644
--- a/test/confs/2123
+++ b/test/confs/2123
@@ -1,12 +1,8 @@
 # Exim test configuration 2123
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2124 b/test/confs/2124
index 930f4b6d5..70d7435a5 100644
--- a/test/confs/2124
+++ b/test/confs/2124
@@ -3,13 +3,9 @@
 CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2125 b/test/confs/2125
index 20f8e1dfa..be2fe1be3 100644
--- a/test/confs/2125
+++ b/test/confs/2125
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -22,7 +18,7 @@ queue_run_in_order
 tls_advertise_hosts = *
 
 tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
-                      {AES}{!AES:3DES}}
+                      {AES256}{AES128}}
 
 # Set certificate only if server
 
@@ -50,7 +46,7 @@ send_to_server:
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   hosts_require_tls = HOSTIPV4
-  tls_require_ciphers = DES-CBC3-SHA
+  tls_require_ciphers = AES128-SHA
   port = PORT_D
   tls_try_verify_hosts = :
 
diff --git a/test/confs/2126 b/test/confs/2126
index 3ea1d9c47..9f0af7cf6 100644
--- a/test/confs/2126
+++ b/test/confs/2126
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2127 b/test/confs/2127
index 786134cae..b177444e9 100644
--- a/test/confs/2127
+++ b/test/confs/2127
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2128 b/test/confs/2128
index 3aa44e8ce..ecdb68be0 100644
--- a/test/confs/2128
+++ b/test/confs/2128
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2130 b/test/confs/2130
index 6354b7cc3..379d2c98a 100644
--- a/test/confs/2130
+++ b/test/confs/2130
@@ -3,14 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/2131 b/test/confs/2131
index 3d83099d1..43db2ac1c 100644
--- a/test/confs/2131
+++ b/test/confs/2131
@@ -3,14 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/2132 b/test/confs/2132
index 11dc3ce21..7fb561bdc 100644
--- a/test/confs/2132
+++ b/test/confs/2132
@@ -1,12 +1,8 @@
 # Exim test configuration 2132 (close copy of 2102)
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2133 b/test/confs/2133
index 064a97acf..ff4350809 100644
--- a/test/confs/2133
+++ b/test/confs/2133
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com
diff --git a/test/confs/2149 b/test/confs/2149
index 1d649e952..072e8e438 100644
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2150 b/test/confs/2150
index 3b27f41c9..f6b5263fa 100644
--- a/test/confs/2150
+++ b/test/confs/2150
@@ -1,12 +1,8 @@
 # Exim test configuration 2150
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/2151 b/test/confs/2151
new file mode 100644
index 000000000..f64cdd50e
--- /dev/null
+++ b/test/confs/2151
@@ -0,0 +1,43 @@
+# Exim test configuration 2151
+
+.include DIR/aux-var/tls_conf_prefix
+
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = acl_rcpt
+callout_random_local_part = $primary_hostname--testing
+trusted_users = CALLER
+
+tls_advertise_hosts = 127.0.0.1 : HOSTIPV4
+
+tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
+tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
+
+# ----- ACL -----
+
+begin acl
+
+acl_rcpt:
+  accept   verify  = recipient/callout=1s,use_sender
+
+# ----- Routers -----
+
+begin routers
+
+callout:
+  driver = manualroute
+  transport = smtp
+  route_data = 127.0.0.1
+  self = send
+
+
+# ----- Transports -----
+
+begin transports
+
+smtp:
+  driver = smtp
+  port = PORT_S
+
+# End
diff --git a/test/confs/2152 b/test/confs/2152
new file mode 100644
index 000000000..a8b6c15f1
--- /dev/null
+++ b/test/confs/2152
@@ -0,0 +1,68 @@
+# Exim test configuration 2152
+# as per 2100 but with TCP Fast Open
+
+SERVER=
+
+.include DIR/aux-var/tls_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+.ifdef _HAVE_TLS
+# that was purely to trigger the lazy-create of builtin macros
+.endif
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+
+log_selector =  +tls_peerdn
+
+queue_only
+queue_run_in_order
+
+tls_advertise_hosts = *
+
+# Set certificate only if server
+
+tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+
+tls_verify_hosts = *
+tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+
+
+# ----- Routers -----
+
+begin routers
+
+client:
+  driver = accept
+  condition = ${if eq {SERVER}{server}{no}{yes}}
+  retry_use_local_part
+  transport = send_to_server
+
+
+# ----- Transports -----
+
+begin transports
+
+send_to_server:
+  driver = smtp
+  allow_localhost
+  hosts = 127.0.0.1
+  port = PORT_D
+  hosts_try_fastopen = *
+  tls_certificate = DIR/aux-fixed/cert2
+  tls_privatekey = DIR/aux-fixed/cert2
+  tls_verify_certificates = DIR/aux-fixed/cert2
+  tls_try_verify_hosts = :
+
+
+# ----- Retry -----
+
+
+begin retry
+
+* * F,5d,10s
+
+
+# End
diff --git a/test/confs/2190 b/test/confs/2190
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/2190
@@ -0,0 +1 @@
+0900
+\ No newline at end of file
diff --git a/test/confs/2191 b/test/confs/2191
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/2191
@@ -0,0 +1 @@
+0900
+\ No newline at end of file
diff --git a/test/confs/2200 b/test/confs/2200
index c57c8c796..904ccfb18 100644
--- a/test/confs/2200
+++ b/test/confs/2200
@@ -1,14 +1,9 @@
 # Exim test configuration 2200
 # Check for dnsdb cache TTL handling
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2201 b/test/confs/2201
index b60439e29..dce78ed7a 100644
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -1,13 +1,8 @@
 # Exim test configuration 2201
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2202 b/test/confs/2202
index e2cf9d421..825be913e 100644
--- a/test/confs/2202
+++ b/test/confs/2202
@@ -2,14 +2,9 @@
 
 CONNECTCOND=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2250 b/test/confs/2250
index 96513bd23..a355bfcdf 100644
--- a/test/confs/2250
+++ b/test/confs/2250
@@ -1,12 +1,7 @@
 # Exim test configuration 2250
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # End
diff --git a/test/confs/2300 b/test/confs/2300
index d8bc1b26f..bc4f4fbc6 100644
--- a/test/confs/2300
+++ b/test/confs/2300
@@ -1,13 +1,8 @@
 # Exim test configuration 2300
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2400 b/test/confs/2400
index 69ef73c6b..b7ad9a800 100644
--- a/test/confs/2400
+++ b/test/confs/2400
@@ -1,13 +1,8 @@
 # Exim test configuration 2400
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2500 b/test/confs/2500
index 1eabf09e4..72bb374ec 100644
--- a/test/confs/2500
+++ b/test/confs/2500
@@ -1,13 +1,8 @@
 # Exim test configuration 2500
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2501 b/test/confs/2501
index 655a3712d..b485b0102 100644
--- a/test/confs/2501
+++ b/test/confs/2501
@@ -1,13 +1,8 @@
 # Exim test configuration 2501
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2600 b/test/confs/2600
index c84d54fec..566e260f2 100644
--- a/test/confs/2600
+++ b/test/confs/2600
@@ -1,13 +1,8 @@
 # Exim test configuration 2600
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2700 b/test/confs/2700
index bb001681d..34e3b11ea 100644
--- a/test/confs/2700
+++ b/test/confs/2700
@@ -1,13 +1,8 @@
 # Exim test configuration 2700
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/2800 b/test/confs/2800
new file mode 100644
index 000000000..607fcf5c7
--- /dev/null
+++ b/test/confs/2800
@@ -0,0 +1,9 @@
+# Exim test configuration 2800
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+# End
diff --git a/test/confs/3000 b/test/confs/3000
index 80c6019a1..9789808fb 100644
--- a/test/confs/3000
+++ b/test/confs/3000
@@ -1,14 +1,9 @@
 # Exim test configuration 3000
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3001 b/test/confs/3001
index 6e047f440..bc0e7e771 100644
--- a/test/confs/3001
+++ b/test/confs/3001
@@ -1,2 +1,7 @@
+# exim test configuration 3001
+exim_path = EXIM_PATH
 tls_advertise_hosts =
-perl_startup = sub taint_flag { ${^TAINT} ? 'ON' : 'OFF' }
+spool_directory = DIR/spool
+perl_startup = $| = 1; \
+	print "Environment visible in Perl:\n"; \
+	print map { "$_=$ENV{$_}\n" } sort keys %ENV;
diff --git a/test/confs/3002 b/test/confs/3002
index 653d38d04..9b668f002 100644
--- a/test/confs/3002
+++ b/test/confs/3002
@@ -1,3 +1,8 @@
+# exim test configuration 3002
+exim_path = EXIM_PATH
+keep_environment = ^FOO\d : BAR
+add_environment = ADDED1=added1 : ADDED2=added2
 tls_advertise_hosts =
-perl_startup = sub taint_flag { ${^TAINT} ? 'ON' : 'OFF' }
-perl_taintmode = yes
+perl_startup = $| = 1; \
+	print "Environment visible in Perl:\n"; \
+	print map { "$_=$ENV{$_}\n" } sort keys %ENV;
diff --git a/test/confs/3011 b/test/confs/3011
new file mode 100644
index 000000000..f584ff517
--- /dev/null
+++ b/test/confs/3011
@@ -0,0 +1,5 @@
+# exim test configuration 3011
+exim_path = EXIM_PATH
+tls_advertise_hosts =
+spool_directory = DIR/spool
+perl_startup = sub taint_flag { ${^TAINT} ? 'ON' : 'OFF' }
diff --git a/test/confs/3012 b/test/confs/3012
new file mode 100644
index 000000000..505e49f94
--- /dev/null
+++ b/test/confs/3012
@@ -0,0 +1,7 @@
+# exim test configuration 3012
+exim_path = EXIM_PATH
+keep_environment = ^FOO\d : BAR
+add_environment = ADDED1=added1 : ADDED2=added2
+tls_advertise_hosts =
+perl_startup = sub taint_flag { ${^TAINT} ? 'ON' : 'OFF' }
+perl_taintmode = yes
diff --git a/test/confs/3100 b/test/confs/3100
index 3eb114882..9f39fcf53 100644
--- a/test/confs/3100
+++ b/test/confs/3100
@@ -1,14 +1,9 @@
 # Exim test configuration 3100
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3200 b/test/confs/3200
index 105676976..c3cd41aac 100644
--- a/test/confs/3200
+++ b/test/confs/3200
@@ -1,13 +1,8 @@
 # Exim test configuration 3200
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3201 b/test/confs/3201
index 478102c38..0593fac66 100644
--- a/test/confs/3201
+++ b/test/confs/3201
@@ -1,13 +1,8 @@
 # Exim test configuration 3201
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/3202 b/test/confs/3202
index b24085c8c..442f8e85e 100644
--- a/test/confs/3202
+++ b/test/confs/3202
@@ -1,13 +1,8 @@
 # Exim test configuration 3202
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3203 b/test/confs/3203
index affd4078d..2c9d28bf9 100644
--- a/test/confs/3203
+++ b/test/confs/3203
@@ -1,13 +1,8 @@
 # Exim test configuration 3203
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3204 b/test/confs/3204
index c1574aeb4..b3b77be38 100644
--- a/test/confs/3204
+++ b/test/confs/3204
@@ -1,13 +1,8 @@
 # Exim test configuration 3204
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3205 b/test/confs/3205
index c53bca0fd..b5ac52727 100644
--- a/test/confs/3205
+++ b/test/confs/3205
@@ -1,13 +1,8 @@
 # Exim test configuration 3205
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3206 b/test/confs/3206
index 670777b4a..e4085ad6c 100644
--- a/test/confs/3206
+++ b/test/confs/3206
@@ -1,14 +1,9 @@
 # Exim test configuration 3206
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3207 b/test/confs/3207
index ba7446d28..6880dcf90 100644
--- a/test/confs/3207
+++ b/test/confs/3207
@@ -1,14 +1,9 @@
 # Exim test configuration 3207
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3208 b/test/confs/3208
index 015215d8e..46266e4c8 100644
--- a/test/confs/3208
+++ b/test/confs/3208
@@ -1,14 +1,9 @@
 # Exim test configuration 3208
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3209 b/test/confs/3209
index d78fcf3c8..d5a442ddb 100644
--- a/test/confs/3209
+++ b/test/confs/3209
@@ -1,14 +1,9 @@
 # Exim test configuration 3209
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3210 b/test/confs/3210
index ffd6a1fbb..61e9f2b36 100644
--- a/test/confs/3210
+++ b/test/confs/3210
@@ -1,13 +1,8 @@
 # Exim test configuration 3210
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3211 b/test/confs/3211
index 063cebc45..96035debd 100644
--- a/test/confs/3211
+++ b/test/confs/3211
@@ -1,13 +1,8 @@
 # Exim test configuration 3211
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3212 b/test/confs/3212
index 35bf4d38b..f52bae994 100644
--- a/test/confs/3212
+++ b/test/confs/3212
@@ -1,13 +1,8 @@
 # Exim test configuration 3212
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3213 b/test/confs/3213
index 5d658e71e..5752f91ed 100644
--- a/test/confs/3213
+++ b/test/confs/3213
@@ -1,13 +1,8 @@
 # Exim test configuration 3213
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3300 b/test/confs/3300
index 2dbf0b67f..792ccc574 100644
--- a/test/confs/3300
+++ b/test/confs/3300
@@ -1,13 +1,8 @@
 # Exim test configuration 3300
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3400 b/test/confs/3400
index cf896819f..6b817c2f4 100644
--- a/test/confs/3400
+++ b/test/confs/3400
@@ -1,13 +1,8 @@
 # Exim test configuration 3400
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3401 b/test/confs/3401
index 058e3f554..afcd48251 100644
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -1,14 +1,9 @@
 # Exim test configuration 3401
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +smtp_mailauth
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/3402 b/test/confs/3402
index 0f35779f0..d22aa99a7 100644
--- a/test/confs/3402
+++ b/test/confs/3402
@@ -1,13 +1,8 @@
 # Exim test configuration 3402
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3403 b/test/confs/3403
index 47827809f..813b3b941 100644
--- a/test/confs/3403
+++ b/test/confs/3403
@@ -1,13 +1,8 @@
 # Exim test configuration 3403
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3404 b/test/confs/3404
index 2a235ed95..a76581de2 100644
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -1,13 +1,8 @@
 # Exim test configuration 3404
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3405 b/test/confs/3405
index 90576fc5e..e9c7b7ea3 100644
--- a/test/confs/3405
+++ b/test/confs/3405
@@ -1,13 +1,8 @@
 # Exim test configuration 3405
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3406 b/test/confs/3406
index b2515ee56..17debde22 100644
--- a/test/confs/3406
+++ b/test/confs/3406
@@ -1,13 +1,8 @@
 # Exim test configuration 3406
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3407 b/test/confs/3407
index 8d8b50b89..11f7659e6 100644
--- a/test/confs/3407
+++ b/test/confs/3407
@@ -2,13 +2,8 @@
 
 OPTION=server_condition = xxx
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/3408 b/test/confs/3408
index 7a28404c4..14f5c6249 100644
--- a/test/confs/3408
+++ b/test/confs/3408
@@ -1,12 +1,7 @@
 # Exim test configuration 3408
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/3409 b/test/confs/3409
index dd3b8d2ed..bfa01a576 100644
--- a/test/confs/3409
+++ b/test/confs/3409
@@ -1,12 +1,7 @@
 # Exim test configuration 3409
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/3410 b/test/confs/3410
index 8beadb7f2..39435d18c 100644
--- a/test/confs/3410
+++ b/test/confs/3410
@@ -1,13 +1,8 @@
 # Exim test configuration 3410
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3411 b/test/confs/3411
index 3f721d797..44feae7bd 100644
--- a/test/confs/3411
+++ b/test/confs/3411
@@ -1,13 +1,8 @@
 # Exim test configuration 3411
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3412 b/test/confs/3412
index 1bdb9d8e2..c0a1c5509 100644
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -1,13 +1,8 @@
 # Exim test configuration 3412
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3413 b/test/confs/3413
index c0eae2022..7329ddccc 100644
--- a/test/confs/3413
+++ b/test/confs/3413
@@ -1,13 +1,8 @@
 # Exim test configuration 3413
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3414 b/test/confs/3414
index 8e0c93c4a..5d0f93c46 100644
--- a/test/confs/3414
+++ b/test/confs/3414
@@ -1,21 +1,23 @@
 # Exim test configuration 3414
 
 ACL=
-S=
+OPT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+chunking_advertise_hosts =
 tls_advertise_hosts =
 
 # ----- Main settings -----
 
 acl_smtp_mail = mail
-S acl_smtp_mailauth=ACL
+OPT acl_smtp_mailauth=ACL
 
 
 # ----- ACLs -----
diff --git a/test/confs/3415 b/test/confs/3415
index 31503df48..37c7629f5 100644
--- a/test/confs/3415
+++ b/test/confs/3415
@@ -4,14 +4,9 @@ SERVER=
 SUBMISSION_OPTIONS=
 AUTH_ID_DOMAIN=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3416 b/test/confs/3416
index 1888371ac..930a2240f 100644
--- a/test/confs/3416
+++ b/test/confs/3416
@@ -1,14 +1,9 @@
 # Exim test configuration 3416
 # Recipient callout with AUTH
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3450 b/test/confs/3450
index 26a277a98..facc8b8ee 100644
--- a/test/confs/3450
+++ b/test/confs/3450
@@ -1,12 +1,8 @@
 # Exim test configuration 3450
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3451 b/test/confs/3451
index 052469d14..d66253992 100644
--- a/test/confs/3451
+++ b/test/confs/3451
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3452 b/test/confs/3452
index 6e411f521..5971c0804 100644
--- a/test/confs/3452
+++ b/test/confs/3452
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3453 b/test/confs/3453
index 0a2a068a7..8d8a008eb 100644
--- a/test/confs/3453
+++ b/test/confs/3453
@@ -2,13 +2,9 @@
 
 REMEMBER=false
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3454 b/test/confs/3454
index 727a71d86..4561c58f7 100644
--- a/test/confs/3454
+++ b/test/confs/3454
@@ -1,12 +1,8 @@
 # Exim test configuration 3454
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3455 b/test/confs/3455
index cf7caed4f..bfa30b445 100644
--- a/test/confs/3455
+++ b/test/confs/3455
@@ -2,13 +2,9 @@
 
 HOSTS_AVOID_TLS=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3460 b/test/confs/3460
index 59da15cb8..7e104c7c9 100644
--- a/test/confs/3460
+++ b/test/confs/3460
@@ -1,12 +1,8 @@
 # Exim test configuration 3460
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3461 b/test/confs/3461
index c93abddd7..b4843b488 100644
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3462 b/test/confs/3462
index f21651e5e..33fabbc04 100644
--- a/test/confs/3462
+++ b/test/confs/3462
@@ -2,13 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3463 b/test/confs/3463
index 1933b8a48..ab15af225 100644
--- a/test/confs/3463
+++ b/test/confs/3463
@@ -2,13 +2,9 @@
 
 REMEMBER=false
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3464 b/test/confs/3464
index 79f0df297..eba6aa6eb 100644
--- a/test/confs/3464
+++ b/test/confs/3464
@@ -1,12 +1,8 @@
 # Exim test configuration 3464
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3465 b/test/confs/3465
index 9486f5016..dfe6b9921 100644
--- a/test/confs/3465
+++ b/test/confs/3465
@@ -2,13 +2,9 @@
 
 HOSTS_AVOID_TLS=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/3500 b/test/confs/3500
index 87e57fc88..68cf703be 100644
--- a/test/confs/3500
+++ b/test/confs/3500
@@ -1,13 +1,8 @@
 # Exim test configuration 3500
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3501 b/test/confs/3501
index a596e8f33..c63e76739 100644
--- a/test/confs/3501
+++ b/test/confs/3501
@@ -1,13 +1,8 @@
 # Exim test configuration 3501
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3600 b/test/confs/3600
index 3e491386b..f6d4f8605 100644
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/3700 b/test/confs/3700
index 1565b5f79..94bd26ebd 100644
--- a/test/confs/3700
+++ b/test/confs/3700
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = myhost.test.ex
 log_selector = +received_recipients +outgoing_port
 
 # ----- Main settings -----
diff --git a/test/confs/4000 b/test/confs/4000
index f5c2d3961..c8ad7f8aa 100644
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,14 +1,9 @@
 # Exim test configuration 4000
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 
 # ----- Main settings -----
diff --git a/test/confs/4001 b/test/confs/4001
index 61ad4c927..85e68a587 100644
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -1,14 +1,9 @@
 # Exim test configuration 4001
 # Content-scan: f-protd interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 av_scanner = f-protd : localhost4 PORT_S
 
diff --git a/test/confs/4002 b/test/confs/4002
index c7d27b811..dde49c3b2 100644
--- a/test/confs/4002
+++ b/test/confs/4002
@@ -1,15 +1,10 @@
 # Exim test configuration 4002
 # Content-scan: aveserver interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = aveserver : DIR/eximdir/aveserver_sock
 
diff --git a/test/confs/4003 b/test/confs/4003
index 380e3a474..fbcf3021c 100644
--- a/test/confs/4003
+++ b/test/confs/4003
@@ -1,15 +1,10 @@
 # Exim test configuration 4002
 # Content-scan: fsecure interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = fsecure : DIR/eximdir/fsec_sock
 
diff --git a/test/confs/4004 b/test/confs/4004
index be674b502..9bc22ce2e 100644
--- a/test/confs/4004
+++ b/test/confs/4004
@@ -1,15 +1,10 @@
 # Exim test configuration 4002
 # Content-scan: sophie interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = sophie : DIR/eximdir/sophie_sock
 
diff --git a/test/confs/4005 b/test/confs/4005
index cd715d5e6..0ebb2be7b 100644
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -4,15 +4,10 @@
 OPT=
 CONTROL=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
+primary_hostname = myhost.test.ex
 
 #XXX we need an additional test for tcp-connected clamd
 av_scanner = clamd : DIR/eximdir/clam_sock CONTROL
diff --git a/test/confs/4006 b/test/confs/4006
index c3d2a3142..3efca602c 100644
--- a/test/confs/4006
+++ b/test/confs/4006
@@ -1,15 +1,10 @@
 # Exim test configuration 4006
 # Content-scan: avast interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = avast : DIR/eximdir/avast_sock : OPTION
 
diff --git a/test/confs/4007 b/test/confs/4007
index f0792722b..55bfcfafb 100644
--- a/test/confs/4007
+++ b/test/confs/4007
@@ -1,15 +1,10 @@
 # Exim test configuration 4007
 # Content-scan: cmsline interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*)
 
diff --git a/test/confs/4008 b/test/confs/4008
index 463167503..a3bb87f73 100644
--- a/test/confs/4008
+++ b/test/confs/4008
@@ -1,15 +1,10 @@
 # Exim test configuration 4008
 # Content-scan: rspamd interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
+primary_hostname = myhost.test.ex
 
 spamd_address = 127.0.0.1 11333 variant=rspamd
 
diff --git a/test/confs/4009 b/test/confs/4009
index 8b86f7ed6..dd21a2183 100644
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -3,15 +3,13 @@
 
 OPT= 127.0.0.1 7833
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
+primary_hostname = myhost.test.ex
+
+# we need to set the sender
+trusted_users = CALLER
 
 spamd_address = OPT
 
diff --git a/test/confs/4010 b/test/confs/4010
index 94dc25b0f..f01baf3cf 100644
--- a/test/confs/4010
+++ b/test/confs/4010
@@ -1,14 +1,9 @@
 # Exim test configuration 0568:  ACL regex=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/4020 b/test/confs/4020
index acc447718..8dfd46888 100644
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -2,14 +2,9 @@
 
 OPT =
 
-exim_path = EXIM_PATH
-hide host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/4028 b/test/confs/4028
index 3174e7543..4a1f682a9 100644
--- a/test/confs/4028
+++ b/test/confs/4028
@@ -4,13 +4,9 @@
 OPT =
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/4029 b/test/confs/4029
index ae4e71850..467d74d8d 100644
--- a/test/confs/4029
+++ b/test/confs/4029
@@ -4,13 +4,9 @@
 OPT =
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/4100 b/test/confs/4100
index b5d938321..2a45bf908 100644
--- a/test/confs/4100
+++ b/test/confs/4100
@@ -1,12 +1,7 @@
 # Exim test configuration 4100
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/4200 b/test/confs/4200
index 2237b5c99..681319353 100644
--- a/test/confs/4200
+++ b/test/confs/4200
@@ -1,10 +1,6 @@
 # Exim test configuration 4200
 
-exim_path = EXIM_PATH
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
 
 # ----- Main settings -----
 
diff --git a/test/confs/4201 b/test/confs/4201
index 980f1d8fa..e12e13828 100644
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -6,13 +6,8 @@ CONTROL =
 INSERT =
 SUB =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/4211 b/test/confs/4211
index 085fecc72..bcd5a4fd1 100644
--- a/test/confs/4211
+++ b/test/confs/4211
@@ -4,12 +4,7 @@
 OPTION = *
 CONTROL =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
 # ----- Main settings -----
 
diff --git a/test/confs/4221 b/test/confs/4221
index 085fecc72..bcd5a4fd1 100644
--- a/test/confs/4221
+++ b/test/confs/4221
@@ -4,12 +4,7 @@
 OPTION = *
 CONTROL =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
 # ----- Main settings -----
 
diff --git a/test/confs/4500 b/test/confs/4500
index cb98407cc..bf4f1f6ad 100644
--- a/test/confs/4500
+++ b/test/confs/4500
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/4503 b/test/confs/4503
index ccff509da..47f4b74c9 100644
--- a/test/confs/4503
+++ b/test/confs/4503
@@ -3,14 +3,9 @@
 SERVER=
 OPT=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/4509 b/test/confs/4509
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/4509
@@ -0,0 +1 @@
+0900
+\ No newline at end of file
diff --git a/test/confs/4700 b/test/confs/4700
index 6a532b6a0..96f3beac1 100644
--- a/test/confs/4700
+++ b/test/confs/4700
@@ -1,12 +1,7 @@
 # Exim test configuration 0211
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/4800 b/test/confs/4800
index 0fff2b87c..876e81d94 100644
--- a/test/confs/4800
+++ b/test/confs/4800
@@ -1,4 +1,7 @@
+# exim test configuration 4800
+exim_path = EXIM_PATH
 tls_advertise_hosts =
+keep_environment =
 
 begin routers
   dnslookup:
diff --git a/test/confs/4801 b/test/confs/4801
index 26ac21982..9a09b0289 100644
--- a/test/confs/4801
+++ b/test/confs/4801
@@ -1,4 +1,7 @@
+# exim test configuration 4801
+exim_path = EXIM_PATH
 tls_advertise_hosts =
+keep_environment =
 
 begin routers
   dnslookup:
diff --git a/test/confs/4802 b/test/confs/4802
index 0fff2b87c..b37eba738 100644
--- a/test/confs/4802
+++ b/test/confs/4802
@@ -1,3 +1,6 @@
+# exim test configuration 4802
+exim_path = EXIM_PATH
+keep_environment =
 tls_advertise_hosts =
 
 begin routers
diff --git a/test/confs/4803 b/test/confs/4803
index c23d89b6e..bb2afffad 100644
--- a/test/confs/4803
+++ b/test/confs/4803
@@ -1,3 +1,6 @@
+# exim test configuration 4803
+exim_path = EXIM_PATH
+keep_environment =
 tls_advertise_hosts =
 dns_trust_aa = *
 
diff --git a/test/confs/4804 b/test/confs/4804
new file mode 100644
index 000000000..a891d14dc
--- /dev/null
+++ b/test/confs/4804
@@ -0,0 +1,44 @@
+# Exim test configuration 4804
+
+SERVER=
+OPT=
+
+.include DIR/aux-var/std_conf_prefix
+
+timezone = UTC
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+
+log_selector = OPT
+
+# ------ ACL ------
+
+begin acl
+
+# ----- Routers -----
+
+begin routers
+
+server:
+  condition = ${if eq {SERVER}{server} {yes}{no}}
+  driver = redirect
+  data = :blackhole:
+
+client:
+  driver = dnslookup
+  dnssec_request_domains = *
+  self = send
+  transport = send_to_server
+
+# ----- Transports -----
+
+begin transports
+
+send_to_server:
+  driver = smtp
+  port = PORT_D
+
+# End
diff --git a/test/confs/4950 b/test/confs/4950
index 752b66aad..6ddee035e 100644
--- a/test/confs/4950
+++ b/test/confs/4950
@@ -1,12 +1,7 @@
 # Exim test configuration 4950
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5000 b/test/confs/5000
index 2ceeb06a8..e3328c6a1 100644
--- a/test/confs/5000
+++ b/test/confs/5000
@@ -1,13 +1,8 @@
 # Exim test configuration 5000
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5001 b/test/confs/5001
index a5475fd85..db8c7dc1f 100644
--- a/test/confs/5001
+++ b/test/confs/5001
@@ -1,12 +1,7 @@
 # Exim test configuration 5001
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5002 b/test/confs/5002
index 021166431..81edaab2a 100644
--- a/test/confs/5002
+++ b/test/confs/5002
@@ -1,13 +1,8 @@
 # Exim test configuration 5002
 
-exim_path = EXIM_PATH
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5003 b/test/confs/5003
index cdfaec5da..763567326 100644
--- a/test/confs/5003
+++ b/test/confs/5003
@@ -1,12 +1,7 @@
 # Exim test configuration 5003
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5004 b/test/confs/5004
index 3596fabaf..75c4eaef9 100644
--- a/test/confs/5004
+++ b/test/confs/5004
@@ -1,12 +1,7 @@
 # Exim test configuration 5004
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5005 b/test/confs/5005
index 6fa97f152..d5d497a06 100644
--- a/test/confs/5005
+++ b/test/confs/5005
@@ -2,14 +2,9 @@
 
 QUOTA=500
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/5006 b/test/confs/5006
index 107d025dd..385d4fe08 100644
--- a/test/confs/5006
+++ b/test/confs/5006
@@ -1,13 +1,8 @@
 # Exim test configuration 5006
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/5007 b/test/confs/5007
index eab0c2013..98f70ee6d 100644
--- a/test/confs/5007
+++ b/test/confs/5007
@@ -2,14 +2,9 @@
 
 QUOTA=500
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/5008 b/test/confs/5008
index adfbecde3..027ba7a54 100644
--- a/test/confs/5008
+++ b/test/confs/5008
@@ -2,14 +2,9 @@
 
 QUOTA_FILECOUNT=0
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/5009 b/test/confs/5009
index f5983a1cb..a632dd223 100644
--- a/test/confs/5009
+++ b/test/confs/5009
@@ -2,14 +2,9 @@
 
 SUB=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/5050 b/test/confs/5050
index 6bff7fe14..462d7dcf2 100644
--- a/test/confs/5050
+++ b/test/confs/5050
@@ -1,12 +1,7 @@
 # Exim test configuration 5050
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5100 b/test/confs/5100
index 908a021a9..61a371176 100644
--- a/test/confs/5100
+++ b/test/confs/5100
@@ -2,14 +2,9 @@
 
 IGNORE_QUOTA=FALSE
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5101 b/test/confs/5101
index 5de00516c..1dbe3e466 100644
--- a/test/confs/5101
+++ b/test/confs/5101
@@ -1,13 +1,8 @@
 # Exim test configuration 5101
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5102 b/test/confs/5102
index bc33185c7..eaa742b83 100644
--- a/test/confs/5102
+++ b/test/confs/5102
@@ -1,13 +1,8 @@
 # Exim test configuration 5102
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5103 b/test/confs/5103
index d9ed330fa..7212fb30e 100644
--- a/test/confs/5103
+++ b/test/confs/5103
@@ -1,13 +1,8 @@
 # Exim test configuration 5103
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5200 b/test/confs/5200
index a6f70518e..cafd2fb5e 100644
--- a/test/confs/5200
+++ b/test/confs/5200
@@ -1,12 +1,7 @@
 # Exim test configuration 5200
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5201 b/test/confs/5201
index 4fa69d0ce..f273d92fa 100644
--- a/test/confs/5201
+++ b/test/confs/5201
@@ -1,12 +1,7 @@
 # Exim test configuration 5201
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5202 b/test/confs/5202
index 6f5f7e679..19855fff3 100644
--- a/test/confs/5202
+++ b/test/confs/5202
@@ -1,12 +1,7 @@
 # Exim test configuration 5202
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5203 b/test/confs/5203
index 99864f5fa..40f4c8370 100644
--- a/test/confs/5203
+++ b/test/confs/5203
@@ -1,12 +1,7 @@
 # Exim test configuration 5203
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5204 b/test/confs/5204
index 2393a5778..5f379b8f1 100644
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -2,14 +2,9 @@
 
 COMMAND_USER=EXIMUSER
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5205 b/test/confs/5205
index fc32d2bdb..efa2de121 100644
--- a/test/confs/5205
+++ b/test/confs/5205
@@ -1,12 +1,7 @@
 # Exim test configuration 5205
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5206 b/test/confs/5206
index 4f9606596..37e89e65f 100644
--- a/test/confs/5206
+++ b/test/confs/5206
@@ -1,12 +1,7 @@
 # Exim test configuration 5206
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5207 b/test/confs/5207
index 018f1fc7d..bfd32bb3b 100644
--- a/test/confs/5207
+++ b/test/confs/5207
@@ -1,13 +1,8 @@
 # Exim test configuration 5207
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5208 b/test/confs/5208
index 5a6276e46..e32dcfc94 100644
--- a/test/confs/5208
+++ b/test/confs/5208
@@ -3,14 +3,9 @@
 LIST=
 SELF=freeze
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5209 b/test/confs/5209
index 334313bb0..b3df43085 100644
--- a/test/confs/5209
+++ b/test/confs/5209
@@ -1,13 +1,8 @@
 # Exim test configuration 5209
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5300 b/test/confs/5300
index e68f9aaff..1ba89388b 100644
--- a/test/confs/5300
+++ b/test/confs/5300
@@ -2,14 +2,9 @@
 
 ALLOW=true
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5301 b/test/confs/5301
index 0579db202..f727ebca0 100644
--- a/test/confs/5301
+++ b/test/confs/5301
@@ -2,14 +2,9 @@
 
 D6=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5400 b/test/confs/5400
index 2a2d45860..9be13fea6 100644
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -1,15 +1,17 @@
 # Exim test configuration 5400
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+# any options on the cutthrough_delivery contol
+CONTROL=
+
+# optional verify-callout
+OPT=
+
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 log_selector = +received_recipients
+queue_only
 
 # ----- Main settings -----
 
@@ -23,7 +25,9 @@ acl_smtp_rcpt = ar
 begin acl
 
 ar:
-	accept control = cutthrough_delivery
+  accept
+	control = cutthrough_deliveryCONTROL
+	OPT
 	logwrite = rcpt for $local_part@$domain
 
 # ----- Routers -----
@@ -44,6 +48,7 @@ all:
   transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}}
   headers_remove = X-hdr-rtr
   headers_add =    X-hdr-rtr-new: $h_X-hdr-rtr:+++
+  errors_to =	   ""
   no_more
 
 
diff --git a/test/confs/5401 b/test/confs/5401
index 3ee414c85..0d93fe5bc 100644
--- a/test/confs/5401
+++ b/test/confs/5401
@@ -1,13 +1,8 @@
 # Exim test configuration 5401
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -21,7 +16,7 @@ begin acl
 
 acl_rcpt:
     accept	control = cutthrough_delivery
-    		verify = recipient
+    		verify = recipient/callout=use_sender
 
 
 # ----- Routers -----
diff --git a/test/confs/5402 b/test/confs/5402
index 8f6811b7e..0984e0cc9 120000..100644
--- a/test/confs/5402
+++ b/test/confs/5402
@@ -1 +1,47 @@
-5400
-\ No newline at end of file
+# Exim test configuration 5402
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+domainlist local_domains = test.ex : *.test.ex
+
+acl_smtp_rcpt = acl_rcpt
+
+# ----- ACLs -------
+
+begin acl
+
+acl_rcpt:
+.ifdef OPT
+    warn	control = cutthrough_delivery
+.endif
+    accept	verify = recipient/callout=use_sender
+
+
+# ----- Routers -----
+
+begin routers
+
+all:
+  driver = manualroute
+  domains = ! +local_domains
+  route_list = * 127.0.0.1
+  self = send
+  transport = smtp
+  no_more
+
+
+# ----- Transports -----
+
+begin transports
+
+smtp:
+  driver = smtp
+  interface = HOSTIPV4
+  port = PORT_S
+
+
+# End
diff --git a/test/confs/5403 b/test/confs/5403
new file mode 100644
index 000000000..a4576a5aa
--- /dev/null
+++ b/test/confs/5403
@@ -0,0 +1,64 @@
+# Exim test configuration 5403
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+log_selector = +received_recipients
+
+# ----- Main settings -----
+
+domainlist local_domains = test.ex : *.test.ex
+
+acl_smtp_rcpt = ar
+
+
+# ----- ACLs -----
+
+begin acl
+
+ar:
+  warn	control =	cutthrough_delivery
+	logwrite =	rcpt for $local_part@$domain
+  warn	condition =	${if eq {verify}{$local_part}}
+	verify =	recipient/callout=use_sender
+  accept
+
+# ----- Routers -----
+
+begin routers
+
+dns:
+  driver = dnslookup
+  domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex
+  self = send
+  transport = smtp
+
+all:
+  driver = manualroute
+  domains = ! +local_domains
+  route_list = special.com HOSTIPV4 ; * 127.0.0.1
+  self = send
+  transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}}
+  headers_remove = X-hdr-rtr
+  headers_add =    X-hdr-rtr-new: $h_X-hdr-rtr:+++
+  no_more
+
+
+# ----- Transports -----
+
+begin transports
+
+smtp:
+  driver = smtp
+  interface = HOSTIPV4
+  port = PORT_S
+  headers_add =  ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}
+
+smtp2:
+  driver = smtp
+  interface = HOSTIPV4
+  port = PORT_S
+
+
+# End
diff --git a/test/confs/5404 b/test/confs/5404
new file mode 120000
index 000000000..8f6811b7e
--- /dev/null
+++ b/test/confs/5404
@@ -0,0 +1 @@
+5400
+\ No newline at end of file
diff --git a/test/confs/5405 b/test/confs/5405
new file mode 120000
index 000000000..8f6811b7e
--- /dev/null
+++ b/test/confs/5405
@@ -0,0 +1 @@
+5400
+\ No newline at end of file
diff --git a/test/confs/5410 b/test/confs/5410
index 735b52932..96ec87496 100644
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -1,12 +1,8 @@
 # Exim test configuration 5410
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/5420 b/test/confs/5420
index f8379c7bd..44a1fdee4 100644
--- a/test/confs/5420
+++ b/test/confs/5420
@@ -1,12 +1,8 @@
 # Exim test configuration 5420
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/5500 b/test/confs/5500
index f1a088d42..1b25be1f8 100644
--- a/test/confs/5500
+++ b/test/confs/5500
@@ -3,14 +3,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5510 b/test/confs/5510
index b3bddcd1a..ab42b242e 100644
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -3,14 +3,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5590 b/test/confs/5590
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/5590
@@ -0,0 +1 @@
+0900
+\ No newline at end of file
diff --git a/test/confs/5591 b/test/confs/5591
new file mode 120000
index 000000000..1bb987150
--- /dev/null
+++ b/test/confs/5591
@@ -0,0 +1 @@
+0900
+\ No newline at end of file
diff --git a/test/confs/5600 b/test/confs/5600
index 2dc1090df..b65a2797e 100644
--- a/test/confs/5600
+++ b/test/confs/5600
@@ -3,13 +3,9 @@
 
 CRL=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = server1.example.com
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -31,7 +27,7 @@ tls_verify_hosts = HOSTIPV4
 tls_try_verify_hosts = *
 tls_verify_certificates = DIR/aux-fixed/cert2
 tls_crl = CRL
-tls_ocsp_file = OCSP
+tls_ocsp_file = RETURN
 
 
 # ------ ACL ------
diff --git a/test/confs/5601 b/test/confs/5601
index 785f0c64f..3309870a3 100644
--- a/test/confs/5601
+++ b/test/confs/5601
@@ -4,12 +4,14 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment  = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
 host_lookup_order = bydns
-primary_hostname = server1.example.com
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+chunking_advertise_hosts =
+primary_hostname = server1.example.com
 
 
 # ----- Main settings -----
@@ -37,7 +39,7 @@ tls_privatekey = ${if eq {SERVER}{server}\
 {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\
 fail}
 
-tls_ocsp_file = OCSP
+tls_ocsp_file = RETURN
 
 
 # ------ ACL ------
diff --git a/test/confs/5610 b/test/confs/5610
new file mode 100644
index 000000000..b65a2797e
--- /dev/null
+++ b/test/confs/5610
@@ -0,0 +1,73 @@
+# Exim test configuration 5600
+# OCSP stapling, server
+
+CRL=
+
+.include DIR/aux-var/tls_conf_prefix
+
+primary_hostname = server1.example.com
+
+# ----- Main settings -----
+
+acl_smtp_connect = check_connect
+acl_smtp_mail = check_mail
+acl_smtp_rcpt = check_recipient
+
+log_selector = +tls_peerdn
+
+queue_only
+queue_run_in_order
+
+tls_advertise_hosts = *
+
+tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
+tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
+
+tls_verify_hosts = HOSTIPV4
+tls_try_verify_hosts = *
+tls_verify_certificates = DIR/aux-fixed/cert2
+tls_crl = CRL
+tls_ocsp_file = RETURN
+
+
+# ------ ACL ------
+
+begin acl
+
+check_connect:
+  accept   logwrite = acl_conn: ocsp in status: $tls_in_ocsp \
+    (${listextract {${eval:$tls_in_ocsp+1}} \
+		{notreq:notresp:vfynotdone:failed:verified}})
+
+check_mail:
+  accept   logwrite = acl_mail: ocsp in status: $tls_in_ocsp \
+    (${listextract {${eval:$tls_in_ocsp+1}} \
+		{notreq:notresp:vfynotdone:failed:verified}})
+
+check_recipient:
+  deny     message = certificate not verified: peerdn=$tls_peerdn
+         ! verify = certificate
+  accept
+
+
+# ----- Routers -----
+
+begin routers
+
+abc:
+  driver = accept
+  retry_use_local_part
+  transport = local_delivery
+
+
+# ----- Transports -----
+
+begin transports
+
+local_delivery:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
+  user = CALLER
+
+# End
diff --git a/test/confs/5611 b/test/confs/5611
new file mode 100644
index 000000000..3309870a3
--- /dev/null
+++ b/test/confs/5611
@@ -0,0 +1,152 @@
+# Exim test configuration 5601
+# OCSP stapling, client
+
+SERVER =
+
+exim_path = EXIM_PATH
+keep_environment  = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
+host_lookup_order = bydns
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/SERVER%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts =
+primary_hostname = server1.example.com
+
+
+# ----- Main settings -----
+
+domainlist local_domains = test.ex : *.test.ex
+
+acl_smtp_rcpt = check_recipient
+acl_smtp_data = check_data
+
+log_selector = +tls_peerdn
+remote_max_parallel = 1
+
+tls_advertise_hosts = *
+
+# Set certificate only if server
+
+tls_certificate = ${if eq {SERVER}{server}\
+{DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem}\
+fail\
+}
+
+#{DIR/aux-fixed/exim-ca/example.com/CA/CA.pem}\
+
+tls_privatekey = ${if eq {SERVER}{server}\
+{DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\
+fail}
+
+tls_ocsp_file = RETURN
+
+
+# ------ ACL ------
+
+begin acl
+
+check_recipient:
+  accept  domains = +local_domains
+  deny    message = relay not permitted
+
+check_data:
+  warn	  condition   = ${if def:h_X-TLS-out:}
+	  logwrite = client claims: $h_X-TLS-out:
+  accept
+
+# ----- Routers -----
+
+begin routers
+
+client:
+  driver = accept
+  condition = ${if eq {SERVER}{server}{no}{yes}}
+  retry_use_local_part
+  transport = send_to_server${if eq{$local_part}{nostaple}{1} \
+				{${if eq{$local_part}{norequire} {2} \
+				{${if eq{$local_part}{smtps} {4}{3}}} \
+			     }}}
+
+server:
+  driver = redirect
+  data = :blackhole:
+  #retry_use_local_part
+  #transport = local_delivery
+
+
+# ----- Transports -----
+
+begin transports
+
+local_delivery:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
+  user = CALLER
+
+send_to_server1:
+  driver = smtp
+  allow_localhost
+  hosts = HOSTIPV4
+  port = PORT_D
+  tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
+  hosts_require_tls = *
+  hosts_request_ocsp = :
+  headers_add = X-TLS-out: ocsp status $tls_out_ocsp \
+    (${listextract {${eval:$tls_out_ocsp+1}} \
+		{notreq:notresp:vfynotdone:failed:verified}})
+
+send_to_server2:
+  driver = smtp
+  allow_localhost
+  hosts = HOSTIPV4
+  port = PORT_D
+  tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
+  hosts_require_tls = *
+# note no ocsp mention here
+  headers_add = X-TLS-out: ocsp status $tls_out_ocsp \
+    (${listextract {${eval:$tls_out_ocsp+1}} \
+		{notreq:notresp:vfynotdone:failed:verified}})
+
+send_to_server3:
+  driver = smtp
+  allow_localhost
+  hosts = 127.0.0.1
+  port = PORT_D
+  helo_data = helo.data.changed
+  tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
+  hosts_require_tls =  *
+  hosts_require_ocsp = *
+  headers_add = X-TLS-out: ocsp status $tls_out_ocsp \
+    (${listextract {${eval:$tls_out_ocsp+1}} \
+		{notreq:notresp:vfynotdone:failed:verified}})
+
+send_to_server4:
+  driver = smtp
+  allow_localhost
+  hosts = 127.0.0.1
+  port = PORT_D
+  helo_data = helo.data.changed
+  tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
+  protocol =           smtps
+  hosts_require_tls =  *
+  hosts_require_ocsp = *
+  headers_add = X-TLS-out: ocsp status $tls_out_ocsp \
+    (${listextract {${eval:$tls_out_ocsp+1}} \
+		{notreq:notresp:vfynotdone:failed:verified}})
+
+
+# ----- Retry -----
+
+
+begin retry
+
+* * F,5d,1s
+
+
+# End
diff --git a/test/confs/5650 b/test/confs/5650
index bf4462be3..ef73220fd 100644
--- a/test/confs/5650
+++ b/test/confs/5650
@@ -3,13 +3,9 @@
 
 CRL=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = server1.example.com
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -27,7 +23,7 @@ tls_advertise_hosts = *
 tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
 tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
 tls_crl = CRL
-tls_ocsp_file = OCSP
+tls_ocsp_file = OPT
 
 #tls_verify_hosts = HOSTIPV4
 #tls_try_verify_hosts = *
diff --git a/test/confs/5651 b/test/confs/5651
index cffa4107c..5803c3ce9 100644
--- a/test/confs/5651
+++ b/test/confs/5651
@@ -3,14 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = server1.example.com
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
 
+primary_hostname = server1.example.com
 
 # ----- Main settings -----
 
@@ -34,7 +29,7 @@ tls_privatekey = ${if eq {SERVER}{server}\
 fail}
 
 # from cmdline define
-tls_ocsp_file = OCSP
+tls_ocsp_file = OPT
 
 
 # ------ ACL ------
diff --git a/test/confs/5700 b/test/confs/5700
index db1aa2a6e..031e690b3 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -1,12 +1,7 @@
 # Exim test configuration 5700
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5710 b/test/confs/5710
index 354d3935b..e61fadc5e 100644
--- a/test/confs/5710
+++ b/test/confs/5710
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 timezone = UTC
 
 # ----- Main settings -----
diff --git a/test/confs/5720 b/test/confs/5720
index e2ef60bdd..2de47bd82 100644
--- a/test/confs/5720
+++ b/test/confs/5720
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 timezone = UTC
 
 # ----- Main settings -----
diff --git a/test/confs/5730 b/test/confs/5730
index 7ed8ad4b7..625decec7 100644
--- a/test/confs/5730
+++ b/test/confs/5730
@@ -3,13 +3,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = server1.example.com
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 
 # ----- Main settings -----
@@ -34,7 +30,7 @@ tls_privatekey = ${if eq {SERVER}{server}\
 fail}
 
 # from cmdline define
-tls_ocsp_file = OCSP
+tls_ocsp_file = OPT
 
 
 # ------ ACL ------
diff --git a/test/confs/5740 b/test/confs/5740
index e20a8b601..ccc907c82 100644
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -4,12 +4,14 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
 host_lookup_order = bydns
-primary_hostname = server1.example.com
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+chunking_advertise_hosts =
+primary_hostname = server1.example.com
 
 
 # ----- Main settings -----
@@ -37,7 +39,7 @@ tls_privatekey = ${if eq {SERVER}{server}\
 {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\
 fail}
 
-tls_ocsp_file = OCSP
+tls_ocsp_file = RETURN
 
 
 # ------ ACL ------
diff --git a/test/confs/5800 b/test/confs/5800
index 6d1b1ac52..aa75b21a1 100644
--- a/test/confs/5800
+++ b/test/confs/5800
@@ -1,11 +1,9 @@
 # Exim test configuration 5800
 # DANE common
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/5820 b/test/confs/5820
index 1b487026f..6c2f26ce0 100644
--- a/test/confs/5820
+++ b/test/confs/5820
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/5840 b/test/confs/5840
index 4f468a384..ac3578dc9 100644
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -51,6 +47,7 @@ client:
   dnssec_request_domains = *
   self = send
   transport = send_to_server
+  errors_to = ""
 
 server:
   driver = redirect
diff --git a/test/confs/5860 b/test/confs/5860
index d3f6db3c4..94436c344 100644
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/5900 b/test/confs/5900
new file mode 100644
index 000000000..f5766d49f
--- /dev/null
+++ b/test/confs/5900
@@ -0,0 +1,35 @@
+# Exim test configuration 5900
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+qualify_domain = test.ex
+
+
+# ----- Routers -----
+
+begin routers
+
+scan:
+   driver = accept
+   transport = scan
+
+
+# ----- Transports -----
+
+begin transports
+
+scan:
+  driver = queuefile
+  directory = DIR/test-mail/subdir
+
+# ----- Retry -----
+
+begin retry
+
+* * F,10m,2d
+
+
+# End
diff --git a/test/confs/5901 b/test/confs/5901
new file mode 100644
index 000000000..5d57c1c73
--- /dev/null
+++ b/test/confs/5901
@@ -0,0 +1,35 @@
+# Exim test configuration 5901
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+qualify_domain = test.ex
+
+
+# ----- Routers -----
+
+begin routers
+
+scan:
+   driver = accept
+   transport = scan
+
+
+# ----- Transports -----
+
+begin transports
+
+scan:
+  driver = queuefile
+  directory = test-mail/subdir
+
+# ----- Retry -----
+
+begin retry
+
+* * F,10m,2d
+
+
+# End
diff --git a/test/confs/5902 b/test/confs/5902
new file mode 100644
index 000000000..ba4acc29f
--- /dev/null
+++ b/test/confs/5902
@@ -0,0 +1,38 @@
+# Exim test configuration 5902
+
+OPT=
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+qualify_domain = test.ex
+
+# ----- Routers -----
+
+begin routers
+
+scan:
+   driver = accept
+   condition = ${if eq {OPT}{scan} {y}}
+   transport = scan
+
+local:
+   driver = accept
+   transport = local_delivery
+
+# ----- Transports -----
+
+begin transports
+
+scan:
+  driver = queuefile
+  directory = DIR/scanner
+
+local_delivery:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  user = CALLER
+
+# End
diff --git a/test/confs/9000 b/test/confs/9000
index 05512bb0d..eba80b812 100644
--- a/test/confs/9000
+++ b/test/confs/9000
@@ -2,14 +2,10 @@
 
 LDAPSERVERS=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
+keep_environment = LDAPTLS_REQCERT
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/9001 b/test/confs/9001
index 6817dbeb5..0518519b8 100644
--- a/test/confs/9001
+++ b/test/confs/9001
@@ -1,13 +1,8 @@
 # Exim test configuration 9001
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/9100 b/test/confs/9100
index e674784ce..a031f44de 100644
--- a/test/confs/9100
+++ b/test/confs/9100
@@ -1,13 +1,8 @@
 # Exim test configuration 9100
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/9200 b/test/confs/9200
index ee4e41030..04f52a9a0 100644
--- a/test/confs/9200
+++ b/test/confs/9200
@@ -2,14 +2,9 @@
 
 SERVERS=localhost/test/ph10/
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/9300 b/test/confs/9300
index de32e9bc7..086b506c6 100644
--- a/test/confs/9300
+++ b/test/confs/9300
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/9350 b/test/confs/9350
index e312ee609..1ac5ebe5f 100644
--- a/test/confs/9350
+++ b/test/confs/9350
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
diff --git a/test/confs/9400 b/test/confs/9400
index 855227b31..66ee61edc 100644
--- a/test/confs/9400
+++ b/test/confs/9400
@@ -1,14 +1,9 @@
 # Exim test configuration 9400
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
diff --git a/test/confs/9401 b/test/confs/9401
index b69c844de..a01167ecb 100644
--- a/test/confs/9401
+++ b/test/confs/9401
@@ -1,12 +1,7 @@
 # Exim test configuration 9401
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/9402 b/test/confs/9402
index 7e455d146..6c00f1ee0 100644
--- a/test/confs/9402
+++ b/test/confs/9402
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/9450 b/test/confs/9450
index 4e2464f4c..cc2379c88 100644
--- a/test/confs/9450
+++ b/test/confs/9450
@@ -1,13 +1,8 @@
 # Exim test configuration 9450
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/9900 b/test/confs/9900
index 7537ebd63..c042cd39a 100644
--- a/test/confs/9900
+++ b/test/confs/9900
@@ -1,12 +1,7 @@
 # Exim test configuration 9900
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/9901 b/test/confs/9901
index f4c569ff1..23ea43fef 100644
--- a/test/confs/9901
+++ b/test/confs/9901
@@ -3,14 +3,9 @@
 COM=
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
diff --git a/test/confs/9902 b/test/confs/9902
index cabbfd5ec..77dc5a243 100644
--- a/test/confs/9902
+++ b/test/confs/9902
@@ -4,13 +4,9 @@
 
 ORDER=
 
-exim_path = EXIM_PATH
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----
diff --git a/test/confs/9903 b/test/confs/9903
index d2f0fcb85..7ef2c620a 100644
--- a/test/confs/9903
+++ b/test/confs/9903
@@ -1,12 +1,7 @@
 # Exim test configuration 9903
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
author	Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>	2016-11-25 11:23:26 +0100
committer	Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>	2016-11-25 11:25:08 +0100
commit	4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch)
tree	3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/confs
parent	7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff)