3 files changed, 62 insertions, 62 deletions
diff --git a/test/confs/0533 b/test/confs/0533
index 8727cc3fb..941994396 100644
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -1,7 +1,5 @@
 # Exim test configuration 0533
 
-CONNECTCOND=
-
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
@@ -13,18 +11,40 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = rcpt
-dns_again_means_nonexist = *
-disable_ipv6
 
-# ----- ACL -----
 
-begin acl
+# ----- Routers -----
+
+begin routers
+
+r1:
+  driver = redirect
+  local_part_prefix = file-
+  local_part_suffix = =*
+  data = DIR/test-mail/${substr_1:$local_part_suffix}
+  file_transport = t1
+
+r2:
+  driver = redirect
+  local_part_prefix = pipe-
+  local_part_suffix = =*
+  data = |${substr_1:$local_part_suffix}
+  pipe_transport = t2
+
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = appendfile
+  envelope_to_add
+  user = CALLER
+  batch_max = 10
 
-rcpt:
-  accept hosts = +ignore_unknown : \
-    *.$sender_address_domain : \
-    $sender_address_domain : \
-    ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}
+t2:
+  driver = pipe
+  user = CALLER
+  batch_max = 10
 
 # End
diff --git a/test/confs/0534 b/test/confs/0534
deleted file mode 100644
index 5e83476fb..000000000
--- a/test/confs/0534
+++ /dev/null
@@ -1,50 +0,0 @@
-# Exim test configuration 0534
-
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-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
-
-# ----- Main settings -----
-
-
-
-# ----- Routers -----
-
-begin routers
-
-r1:
-  driver = redirect
-  local_part_prefix = file-
-  local_part_suffix = =*
-  data = DIR/test-mail/${substr_1:$local_part_suffix}
-  file_transport = t1
-
-r2:
-  driver = redirect
-  local_part_prefix = pipe-
-  local_part_suffix = =*
-  data = |${substr_1:$local_part_suffix}
-  pipe_transport = t2
-
-
-# ----- Transports -----
-
-begin transports
-
-t1:
-  driver = appendfile
-  envelope_to_add
-  user = CALLER
-  batch_max = 10
-
-t2:
-  driver = pipe
-  user = CALLER
-  batch_max = 10
-
-# End
diff --git a/test/confs/2202 b/test/confs/2202
new file mode 100644
index 000000000..a00457802
--- /dev/null
+++ b/test/confs/2202
@@ -0,0 +1,30 @@
+# Exim test configuration 2202
+
+CONNECTCOND=
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+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
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = rcpt
+dns_again_means_nonexist = *
+disable_ipv6
+
+# ----- ACL -----
+
+begin acl
+
+rcpt:
+  accept hosts = +ignore_unknown : \
+    *.$sender_address_domain : \
+    $sender_address_domain : \
+    ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}
+
+# End