From bc3c7bb7d4aba3e563434e5627fe1f2176aa18c0 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Thu, 28 Jan 2016 22:20:33 +0100
Subject: [PATCH 1/1] Fix CVE-2016-1531

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

(cherry picked from commit 2b92b67bfc33efe05e6ff2ea3852731ac2273832)
(cherry picked from commit 14b82c8b736c8ed24eda144f57703cb9feac6323)
(cherry picked from commit 9ca92d0c6e9c6f161bd8111366c6952d3a9315e2)
(cherry picked from commit 0020c6d9ecfd98ed7b2b337ed4f898fdc409784b)
(cherry picked from commit e8f96966360ea8867ad6a8b5affda6c37fa4958c)
(cherry picked from commit ef6fb807c1e1a665f444f644c60c77269f7c5209)
---
 doc/doc-docbook/spec.xfpt    | 47 ++++++++++++++++++++++++++++++-
 doc/doc-txt/ChangeLog        |  1 +
 src/OS/Makefile-Base         |  2 ++
 src/scripts/MakeLinks        |  2 +-
 src/src/environment.c        | 54 ++++++++++++++++++++++++++++++++++++
 src/src/exim.c               | 20 ++++++++++---
 src/src/functions.h          |  2 ++
 src/src/globals.c            |  3 ++
 src/src/globals.h            |  2 ++
 src/src/readconf.c           | 36 ++++++++++++++++++++++++
 src/src/setenv.c             |  3 ++
 src/src/string.c             | 11 ++++++++
 src/src/tls-openssl.c        |  2 +-
 test/confs/0000              |  2 +-
 test/confs/0001              |  1 +
 test/confs/0002              |  1 +
 test/confs/0003              |  1 +
 test/confs/0004              |  1 +
 test/confs/0005              |  1 +
 test/confs/0006              |  1 +
 test/confs/0007              |  1 +
 test/confs/0008              |  1 +
 test/confs/0009              |  1 +
 test/confs/0010              |  1 +
 test/confs/0011              |  1 +
 test/confs/0012              |  1 +
 test/confs/0013              |  1 +
 test/confs/0014              |  1 +
 test/confs/0015              |  1 +
 test/confs/0016              |  1 +
 test/confs/0017              |  1 +
 test/confs/0018              |  1 +
 test/confs/0019              |  1 +
 test/confs/0020              |  1 +
 test/confs/0021              |  1 +
 test/confs/0022              |  1 +
 test/confs/0023              |  1 +
 test/confs/0024              |  1 +
 test/confs/0025              |  1 +
 test/confs/0026              |  1 +
 test/confs/0027              |  1 +
 test/confs/0028              |  1 +
 test/confs/0029              |  1 +
 test/confs/0030              |  1 +
 test/confs/0031              |  1 +
 test/confs/0032              |  1 +
 test/confs/0033              |  1 +
 test/confs/0034              |  1 +
 test/confs/0035              |  1 +
 test/confs/0036              |  1 +
 test/confs/0037              |  1 +
 test/confs/0038              |  1 +
 test/confs/0039              |  1 +
 test/confs/0040              |  1 +
 test/confs/0041              |  1 +
 test/confs/0042              |  1 +
 test/confs/0043              |  1 +
 test/confs/0044              |  1 +
 test/confs/0045              |  1 +
 test/confs/0046              |  1 +
 test/confs/0047              |  1 +
 test/confs/0048              |  1 +
 test/confs/0049              |  1 +
 test/confs/0050              |  1 +
 test/confs/0051              |  1 +
 test/confs/0052              |  1 +
 test/confs/0053              |  1 +
 test/confs/0054              |  1 +
 test/confs/0055              |  1 +
 test/confs/0056              |  1 +
 test/confs/0057              |  1 +
 test/confs/0058              |  1 +
 test/confs/0059              |  1 +
 test/confs/0060              |  1 +
 test/confs/0061              |  1 +
 test/confs/0062              |  1 +
 test/confs/0063              |  1 +
 test/confs/0064              |  1 +
 test/confs/0065              |  1 +
 test/confs/0066              |  1 +
 test/confs/0067              |  1 +
 test/confs/0068              |  1 +
 test/confs/0069              |  1 +
 test/confs/0070              |  1 +
 test/confs/0071              |  1 +
 test/confs/0072              |  1 +
 test/confs/0073              |  1 +
 test/confs/0074              |  1 +
 test/confs/0075              |  1 +
 test/confs/0076              |  1 +
 test/confs/0077              |  1 +
 test/confs/0078              |  1 +
 test/confs/0079              |  1 +
 test/confs/0080              |  1 +
 test/confs/0081              |  1 +
 test/confs/0082              |  1 +
 test/confs/0083              |  1 +
 test/confs/0084              |  1 +
 test/confs/0085              |  1 +
 test/confs/0086              |  1 +
 test/confs/0087              |  1 +
 test/confs/0088              |  1 +
 test/confs/0089              |  1 +
 test/confs/0090              |  1 +
 test/confs/0091              |  1 +
 test/confs/0092              |  1 +
 test/confs/0093              |  1 +
 test/confs/0094              |  1 +
 test/confs/0095              |  1 +
 test/confs/0096              |  1 +
 test/confs/0097              |  1 +
 test/confs/0098              |  1 +
 test/confs/0099              |  1 +
 test/confs/0100              |  1 +
 test/confs/0101              |  1 +
 test/confs/0102              |  1 +
 test/confs/0103              |  1 +
 test/confs/0104              |  1 +
 test/confs/0105              |  1 +
 test/confs/0106              |  1 +
 test/confs/0107              |  1 +
 test/confs/0108              |  1 +
 test/confs/0109              |  1 +
 test/confs/0110              |  1 +
 test/confs/0111              |  1 +
 test/confs/0112              |  1 +
 test/confs/0113              |  1 +
 test/confs/0114              |  1 +
 test/confs/0115              |  1 +
 test/confs/0116              |  1 +
 test/confs/0117              |  1 +
 test/confs/0118              |  1 +
 test/confs/0119              |  1 +
 test/confs/0120              |  1 +
 test/confs/0121              |  1 +
 test/confs/0122              |  1 +
 test/confs/0123              |  1 +
 test/confs/0124              |  1 +
 test/confs/0125              |  1 +
 test/confs/0126              |  1 +
 test/confs/0127              |  1 +
 test/confs/0128              |  1 +
 test/confs/0129              |  1 +
 test/confs/0130              |  1 +
 test/confs/0131              |  1 +
 test/confs/0132              |  1 +
 test/confs/0133              |  1 +
 test/confs/0134              |  1 +
 test/confs/0135              |  1 +
 test/confs/0136              |  1 +
 test/confs/0137              |  1 +
 test/confs/0138              |  1 +
 test/confs/0139              |  1 +
 test/confs/0140              |  1 +
 test/confs/0141              |  1 +
 test/confs/0142              |  1 +
 test/confs/0143              |  1 +
 test/confs/0144              |  1 +
 test/confs/0145              |  1 +
 test/confs/0146              |  1 +
 test/confs/0147              |  1 +
 test/confs/0148              |  1 +
 test/confs/0149              |  1 +
 test/confs/0150              |  1 +
 test/confs/0151              |  1 +
 test/confs/0152              |  1 +
 test/confs/0153              |  1 +
 test/confs/0154              |  1 +
 test/confs/0155              |  1 +
 test/confs/0156              |  1 +
 test/confs/0157              |  1 +
 test/confs/0158              |  1 +
 test/confs/0159              |  1 +
 test/confs/0160              |  1 +
 test/confs/0161              |  1 +
 test/confs/0162              |  1 +
 test/confs/0163              |  1 +
 test/confs/0164              |  1 +
 test/confs/0165              |  1 +
 test/confs/0166              |  1 +
 test/confs/0167              |  1 +
 test/confs/0168              |  1 +
 test/confs/0169              |  1 +
 test/confs/0170              |  1 +
 test/confs/0171              |  1 +
 test/confs/0172              |  1 +
 test/confs/0173              |  1 +
 test/confs/0174              |  1 +
 test/confs/0175              |  1 +
 test/confs/0176              |  1 +
 test/confs/0177              |  1 +
 test/confs/0178              |  1 +
 test/confs/0179              |  1 +
 test/confs/0180              |  1 +
 test/confs/0181              |  1 +
 test/confs/0182              |  1 +
 test/confs/0183              |  1 +
 test/confs/0184              |  1 +
 test/confs/0185              |  1 +
 test/confs/0186              |  1 +
 test/confs/0187              |  1 +
 test/confs/0188              |  1 +
 test/confs/0189              |  1 +
 test/confs/0190              |  1 +
 test/confs/0191              |  1 +
 test/confs/0192              |  1 +
 test/confs/0193              |  1 +
 test/confs/0194              |  1 +
 test/confs/0195              |  1 +
 test/confs/0196              |  1 +
 test/confs/0197              |  1 +
 test/confs/0198              |  1 +
 test/confs/0199              |  1 +
 test/confs/0200              |  1 +
 test/confs/0201              |  1 +
 test/confs/0202              |  1 +
 test/confs/0203              |  1 +
 test/confs/0204              |  1 +
 test/confs/0205              |  1 +
 test/confs/0206              |  1 +
 test/confs/0207              |  1 +
 test/confs/0208              |  1 +
 test/confs/0209              |  1 +
 test/confs/0210              |  1 +
 test/confs/0211              |  1 +
 test/confs/0212              |  1 +
 test/confs/0213              |  1 +
 test/confs/0214              |  1 +
 test/confs/0215              |  1 +
 test/confs/0216              |  1 +
 test/confs/0217              |  1 +
 test/confs/0218              |  1 +
 test/confs/0219              |  1 +
 test/confs/0220              |  1 +
 test/confs/0221              |  1 +
 test/confs/0222              |  1 +
 test/confs/0223              |  1 +
 test/confs/0224              |  1 +
 test/confs/0225              |  1 +
 test/confs/0226              |  1 +
 test/confs/0227              |  1 +
 test/confs/0228              |  1 +
 test/confs/0229              |  1 +
 test/confs/0230              |  1 +
 test/confs/0231              |  1 +
 test/confs/0232              |  1 +
 test/confs/0233              |  1 +
 test/confs/0234              |  1 +
 test/confs/0235              |  1 +
 test/confs/0236              |  1 +
 test/confs/0237              |  1 +
 test/confs/0238              |  1 +
 test/confs/0239              |  1 +
 test/confs/0240              |  1 +
 test/confs/0241              |  1 +
 test/confs/0242              |  1 +
 test/confs/0243              |  1 +
 test/confs/0244              |  1 +
 test/confs/0245              |  1 +
 test/confs/0246              |  1 +
 test/confs/0247              |  1 +
 test/confs/0248              |  1 +
 test/confs/0249              |  1 +
 test/confs/0250              |  1 +
 test/confs/0251              |  1 +
 test/confs/0252              |  1 +
 test/confs/0253              |  1 +
 test/confs/0254              |  1 +
 test/confs/0255              |  1 +
 test/confs/0256              |  1 +
 test/confs/0257              |  1 +
 test/confs/0258              |  1 +
 test/confs/0259              |  1 +
 test/confs/0260              |  1 +
 test/confs/0261              |  1 +
 test/confs/0262              |  1 +
 test/confs/0263              |  1 +
 test/confs/0264              |  1 +
 test/confs/0265              |  1 +
 test/confs/0266              |  1 +
 test/confs/0267              |  1 +
 test/confs/0268              |  1 +
 test/confs/0269              |  1 +
 test/confs/0270              |  1 +
 test/confs/0271              |  1 +
 test/confs/0272              |  1 +
 test/confs/0273              |  1 +
 test/confs/0274              |  1 +
 test/confs/0275              |  1 +
 test/confs/0276              |  1 +
 test/confs/0277              |  1 +
 test/confs/0278              |  1 +
 test/confs/0279              |  1 +
 test/confs/0280              |  1 +
 test/confs/0281              |  1 +
 test/confs/0282              |  1 +
 test/confs/0283              |  1 +
 test/confs/0284              |  1 +
 test/confs/0285              |  1 +
 test/confs/0286              |  1 +
 test/confs/0287              |  1 +
 test/confs/0288              |  1 +
 test/confs/0289              |  1 +
 test/confs/0290              |  1 +
 test/confs/0291              |  1 +
 test/confs/0292              |  1 +
 test/confs/0293              |  1 +
 test/confs/0294              |  1 +
 test/confs/0295              |  1 +
 test/confs/0296              |  1 +
 test/confs/0297              |  1 +
 test/confs/0298              |  1 +
 test/confs/0299              |  1 +
 test/confs/0300              |  1 +
 test/confs/0301              |  1 +
 test/confs/0302              |  1 +
 test/confs/0303              |  1 +
 test/confs/0304              |  1 +
 test/confs/0305              |  1 +
 test/confs/0306              |  1 +
 test/confs/0307              |  1 +
 test/confs/0308              |  1 +
 test/confs/0309              |  1 +
 test/confs/0310              |  1 +
 test/confs/0311              |  1 +
 test/confs/0312              |  1 +
 test/confs/0313              |  1 +
 test/confs/0314              |  1 +
 test/confs/0315              |  1 +
 test/confs/0316              |  1 +
 test/confs/0317              |  1 +
 test/confs/0318              |  1 +
 test/confs/0319              |  1 +
 test/confs/0320              |  1 +
 test/confs/0321              |  1 +
 test/confs/0322              |  1 +
 test/confs/0323              |  1 +
 test/confs/0324              |  1 +
 test/confs/0325              |  1 +
 test/confs/0326              |  1 +
 test/confs/0327              |  1 +
 test/confs/0328              |  1 +
 test/confs/0329              |  1 +
 test/confs/0330              |  1 +
 test/confs/0331              |  1 +
 test/confs/0332              |  1 +
 test/confs/0333              |  1 +
 test/confs/0334              |  1 +
 test/confs/0335              |  1 +
 test/confs/0336              |  1 +
 test/confs/0337              |  1 +
 test/confs/0338              |  1 +
 test/confs/0339              |  1 +
 test/confs/0340              |  1 +
 test/confs/0341              |  1 +
 test/confs/0342              |  1 +
 test/confs/0343              |  1 +
 test/confs/0344              |  1 +
 test/confs/0345              |  1 +
 test/confs/0346              |  1 +
 test/confs/0347              |  1 +
 test/confs/0348              |  1 +
 test/confs/0349              |  1 +
 test/confs/0350              |  1 +
 test/confs/0351              |  1 +
 test/confs/0352              |  1 +
 test/confs/0353              |  1 +
 test/confs/0354              |  1 +
 test/confs/0355              |  1 +
 test/confs/0356              |  1 +
 test/confs/0357              |  1 +
 test/confs/0358              |  1 +
 test/confs/0359              |  1 +
 test/confs/0360              |  1 +
 test/confs/0361              |  1 +
 test/confs/0362              |  1 +
 test/confs/0363              |  1 +
 test/confs/0364              |  1 +
 test/confs/0365              |  1 +
 test/confs/0366              |  1 +
 test/confs/0367              |  1 +
 test/confs/0368              |  1 +
 test/confs/0369              |  1 +
 test/confs/0370              |  1 +
 test/confs/0371              |  1 +
 test/confs/0372              |  1 +
 test/confs/0373              |  1 +
 test/confs/0374              |  1 +
 test/confs/0375              |  1 +
 test/confs/0376              |  1 +
 test/confs/0377              |  1 +
 test/confs/0378              |  1 +
 test/confs/0379              |  1 +
 test/confs/0380              |  1 +
 test/confs/0381              |  1 +
 test/confs/0382              |  1 +
 test/confs/0383              |  1 +
 test/confs/0384              |  1 +
 test/confs/0385              |  1 +
 test/confs/0386              |  1 +
 test/confs/0387              |  1 +
 test/confs/0388              |  1 +
 test/confs/0389              |  1 +
 test/confs/0390              |  1 +
 test/confs/0391              |  1 +
 test/confs/0392              |  1 +
 test/confs/0393              |  1 +
 test/confs/0394              |  1 +
 test/confs/0395              |  1 +
 test/confs/0396              |  1 +
 test/confs/0397              |  1 +
 test/confs/0398              |  1 +
 test/confs/0399              |  1 +
 test/confs/0400              |  1 +
 test/confs/0401              |  1 +
 test/confs/0402              |  1 +
 test/confs/0403              |  1 +
 test/confs/0404              |  1 +
 test/confs/0405              |  1 +
 test/confs/0406              |  1 +
 test/confs/0407              |  1 +
 test/confs/0408              |  1 +
 test/confs/0409              |  1 +
 test/confs/0410              |  1 +
 test/confs/0411              |  1 +
 test/confs/0412              |  1 +
 test/confs/0413              |  1 +
 test/confs/0414              |  1 +
 test/confs/0415              |  1 +
 test/confs/0416              |  1 +
 test/confs/0417              |  1 +
 test/confs/0418              |  1 +
 test/confs/0419              |  1 +
 test/confs/0420              |  1 +
 test/confs/0421              |  1 +
 test/confs/0422              |  1 +
 test/confs/0423              |  1 +
 test/confs/0424              |  1 +
 test/confs/0425              |  1 +
 test/confs/0426              |  1 +
 test/confs/0427              |  1 +
 test/confs/0428              |  1 +
 test/confs/0429              |  1 +
 test/confs/0430              |  1 +
 test/confs/0431              |  1 +
 test/confs/0432              |  1 +
 test/confs/0433              |  1 +
 test/confs/0434              |  1 +
 test/confs/0435              |  1 +
 test/confs/0436              |  1 +
 test/confs/0437              |  1 +
 test/confs/0438              |  1 +
 test/confs/0439              |  1 +
 test/confs/0440              |  1 +
 test/confs/0441              |  1 +
 test/confs/0442              |  1 +
 test/confs/0443              |  1 +
 test/confs/0444              |  1 +
 test/confs/0445              |  1 +
 test/confs/0446              |  1 +
 test/confs/0447              |  1 +
 test/confs/0448              |  1 +
 test/confs/0449              |  1 +
 test/confs/0450              |  1 +
 test/confs/0451              |  1 +
 test/confs/0452              |  1 +
 test/confs/0453              |  1 +
 test/confs/0454              |  1 +
 test/confs/0455              |  1 +
 test/confs/0456              |  1 +
 test/confs/0457              |  1 +
 test/confs/0458              |  1 +
 test/confs/0459              |  1 +
 test/confs/0460              |  1 +
 test/confs/0461              |  1 +
 test/confs/0462              |  1 +
 test/confs/0463              |  1 +
 test/confs/0464              |  1 +
 test/confs/0465              |  1 +
 test/confs/0466              |  1 +
 test/confs/0467              |  1 +
 test/confs/0468              |  1 +
 test/confs/0469              |  1 +
 test/confs/0470              |  1 +
 test/confs/0471              |  1 +
 test/confs/0472              |  1 +
 test/confs/0473              |  1 +
 test/confs/0474              |  1 +
 test/confs/0475              |  1 +
 test/confs/0476              |  1 +
 test/confs/0477              |  1 +
 test/confs/0478              |  1 +
 test/confs/0479              |  1 +
 test/confs/0480              |  1 +
 test/confs/0481              |  1 +
 test/confs/0482              |  1 +
 test/confs/0483              |  1 +
 test/confs/0484              |  1 +
 test/confs/0485              |  1 +
 test/confs/0486              |  1 +
 test/confs/0487              |  1 +
 test/confs/0488              |  1 +
 test/confs/0489              |  1 +
 test/confs/0490              |  1 +
 test/confs/0491              |  1 +
 test/confs/0492              |  1 +
 test/confs/0493              |  1 +
 test/confs/0494              |  1 +
 test/confs/0495              |  1 +
 test/confs/0496              |  1 +
 test/confs/0497              |  1 +
 test/confs/0498              |  1 +
 test/confs/0499              |  1 +
 test/confs/0500              |  1 +
 test/confs/0501              |  1 +
 test/confs/0502              |  1 +
 test/confs/0503              |  1 +
 test/confs/0504              |  1 +
 test/confs/0505              |  1 +
 test/confs/0506              |  1 +
 test/confs/0507              |  1 +
 test/confs/0508              |  1 +
 test/confs/0509              |  1 +
 test/confs/0510              |  1 +
 test/confs/0511              |  1 +
 test/confs/0512              |  1 +
 test/confs/0513              |  1 +
 test/confs/0514              |  1 +
 test/confs/0515              |  1 +
 test/confs/0516              |  1 +
 test/confs/0517              |  1 +
 test/confs/0518              |  1 +
 test/confs/0519              |  1 +
 test/confs/0520              |  1 +
 test/confs/0521              |  1 +
 test/confs/0522              |  1 +
 test/confs/0523              |  1 +
 test/confs/0524              |  1 +
 test/confs/0525              |  1 +
 test/confs/0526              |  1 +
 test/confs/0527              |  1 +
 test/confs/0528              |  1 +
 test/confs/0529              |  1 +
 test/confs/0530              |  1 +
 test/confs/0531              |  1 +
 test/confs/0532              |  1 +
 test/confs/0533              |  1 +
 test/confs/0534              |  1 +
 test/confs/0535              |  1 +
 test/confs/0536              |  1 +
 test/confs/0537              |  1 +
 test/confs/0538              |  1 +
 test/confs/0539              |  1 +
 test/confs/0540              |  1 +
 test/confs/0541              |  1 +
 test/confs/0542              |  1 +
 test/confs/0543              |  1 +
 test/confs/0544              |  1 +
 test/confs/0545              |  1 +
 test/confs/0546              |  1 +
 test/confs/0547              |  1 +
 test/confs/0548              |  1 +
 test/confs/0549              |  1 +
 test/confs/0550              |  1 +
 test/confs/0551              |  1 +
 test/confs/0552              |  1 +
 test/confs/0553              |  1 +
 test/confs/0554              |  1 +
 test/confs/0555              |  1 +
 test/confs/0556              |  1 +
 test/confs/0557              |  1 +
 test/confs/0558              |  1 +
 test/confs/0559              |  1 +
 test/confs/0560              |  1 +
 test/confs/0561              |  1 +
 test/confs/0562              |  1 +
 test/confs/0563              |  2 ++
 test/confs/0564              |  1 +
 test/confs/0565              |  1 +
 test/confs/0566              |  1 +
 test/confs/0567              |  1 +
 test/confs/0569              |  1 +
 test/confs/0570              |  1 +
 test/confs/0571              |  1 +
 test/confs/0572              |  1 +
 test/confs/0573              |  1 +
 test/confs/0600              |  1 +
 test/confs/0601              |  1 +
 test/confs/0602              |  1 +
 test/confs/0603              |  1 +
 test/confs/0604              |  1 +
 test/confs/0605              |  1 +
 test/confs/0606              |  1 +
 test/confs/0607              |  1 +
 test/confs/0608              |  1 +
 test/confs/0609              |  1 +
 test/confs/0610              |  1 +
 test/confs/0611              |  1 +
 test/confs/0612              |  1 +
 test/confs/0613              |  1 +
 test/confs/0614              |  1 +
 test/confs/0615              |  6 ++++
 test/confs/0616              |  8 ++++++
 test/confs/1000              |  1 +
 test/confs/1001              |  1 +
 test/confs/1002              |  1 +
 test/confs/1003              |  1 +
 test/confs/1005              |  1 +
 test/confs/1006              |  1 +
 test/confs/1007              |  1 +
 test/confs/1008              |  1 +
 test/confs/1009              |  1 +
 test/confs/1010              |  1 +
 test/confs/2000              |  1 +
 test/confs/2001              |  1 +
 test/confs/2002              |  1 +
 test/confs/2003              |  1 +
 test/confs/2004              |  1 +
 test/confs/2005              |  1 +
 test/confs/2006              |  1 +
 test/confs/2007              |  1 +
 test/confs/2008              |  1 +
 test/confs/2009              |  1 +
 test/confs/2010              |  1 +
 test/confs/2012              |  1 +
 test/confs/2013              |  1 +
 test/confs/2014              |  1 +
 test/confs/2015              |  1 +
 test/confs/2016              |  1 +
 test/confs/2017              |  1 +
 test/confs/2018              |  1 +
 test/confs/2019              |  1 +
 test/confs/2020              |  1 +
 test/confs/2021              |  1 +
 test/confs/2022              |  1 +
 test/confs/2023              |  1 +
 test/confs/2024              |  1 +
 test/confs/2025              |  1 +
 test/confs/2026              |  1 +
 test/confs/2027              |  1 +
 test/confs/2028              |  1 +
 test/confs/2029              |  1 +
 test/confs/2030              |  1 +
 test/confs/2031              |  1 +
 test/confs/2032              |  1 +
 test/confs/2033              |  1 +
 test/confs/2100              |  1 +
 test/confs/2101              |  1 +
 test/confs/2102              |  1 +
 test/confs/2103              |  1 +
 test/confs/2104              |  1 +
 test/confs/2105              |  1 +
 test/confs/2106              |  1 +
 test/confs/2107              |  1 +
 test/confs/2108              |  1 +
 test/confs/2109              |  1 +
 test/confs/2110              |  1 +
 test/confs/2111              |  1 +
 test/confs/2112              |  1 +
 test/confs/2113              |  1 +
 test/confs/2114              |  1 +
 test/confs/2115              |  1 +
 test/confs/2116              |  1 +
 test/confs/2117              |  1 +
 test/confs/2118              |  1 +
 test/confs/2119              |  1 +
 test/confs/2120              |  1 +
 test/confs/2121              |  1 +
 test/confs/2122              |  1 +
 test/confs/2123              |  1 +
 test/confs/2124              |  1 +
 test/confs/2125              |  1 +
 test/confs/2126              |  1 +
 test/confs/2127              |  1 +
 test/confs/2128              |  1 +
 test/confs/2130              |  1 +
 test/confs/2131              |  1 +
 test/confs/2132              |  1 +
 test/confs/2133              |  1 +
 test/confs/2149              |  1 +
 test/confs/2150              |  1 +
 test/confs/2200              |  1 +
 test/confs/2201              |  1 +
 test/confs/2202              |  1 +
 test/confs/2250              |  1 +
 test/confs/2300              |  1 +
 test/confs/2400              |  1 +
 test/confs/2500              |  1 +
 test/confs/2501              |  1 +
 test/confs/2600              |  1 +
 test/confs/2700              |  1 +
 test/confs/3000              |  1 +
 test/confs/3100              |  1 +
 test/confs/3200              |  1 +
 test/confs/3201              |  1 +
 test/confs/3202              |  1 +
 test/confs/3203              |  1 +
 test/confs/3204              |  1 +
 test/confs/3205              |  1 +
 test/confs/3206              |  1 +
 test/confs/3207              |  1 +
 test/confs/3208              |  1 +
 test/confs/3209              |  1 +
 test/confs/3210              |  1 +
 test/confs/3211              |  1 +
 test/confs/3212              |  1 +
 test/confs/3213              |  1 +
 test/confs/3300              |  1 +
 test/confs/3400              |  1 +
 test/confs/3401              |  1 +
 test/confs/3402              |  1 +
 test/confs/3403              |  1 +
 test/confs/3404              |  1 +
 test/confs/3405              |  1 +
 test/confs/3406              |  1 +
 test/confs/3407              |  1 +
 test/confs/3408              |  1 +
 test/confs/3409              |  1 +
 test/confs/3410              |  1 +
 test/confs/3411              |  1 +
 test/confs/3412              |  1 +
 test/confs/3413              |  1 +
 test/confs/3414              |  1 +
 test/confs/3415              |  1 +
 test/confs/3416              |  1 +
 test/confs/3450              |  1 +
 test/confs/3451              |  1 +
 test/confs/3452              |  1 +
 test/confs/3453              |  1 +
 test/confs/3454              |  1 +
 test/confs/3455              |  1 +
 test/confs/3460              |  1 +
 test/confs/3461              |  1 +
 test/confs/3462              |  1 +
 test/confs/3463              |  1 +
 test/confs/3464              |  1 +
 test/confs/3465              |  1 +
 test/confs/3500              |  1 +
 test/confs/3501              |  1 +
 test/confs/3600              |  1 +
 test/confs/3700              |  1 +
 test/confs/4000              |  1 +
 test/confs/4001              |  1 +
 test/confs/4002              |  1 +
 test/confs/4003              |  1 +
 test/confs/4004              |  1 +
 test/confs/4005              |  1 +
 test/confs/4006              |  1 +
 test/confs/4007              |  1 +
 test/confs/4008              |  1 +
 test/confs/4009              |  1 +
 test/confs/4010              |  1 +
 test/confs/4020              |  1 +
 test/confs/4028              |  1 +
 test/confs/4029              |  1 +
 test/confs/4100              |  1 +
 test/confs/4200              |  1 +
 test/confs/4201              |  1 +
 test/confs/4211              |  1 +
 test/confs/4221              |  1 +
 test/confs/4500              |  1 +
 test/confs/4503              |  1 +
 test/confs/4700              |  1 +
 test/confs/4800              |  3 ++
 test/confs/4801              |  3 ++
 test/confs/4802              |  3 ++
 test/confs/4803              |  3 ++
 test/confs/4950              |  1 +
 test/confs/5000              |  1 +
 test/confs/5001              |  1 +
 test/confs/5002              |  1 +
 test/confs/5003              |  1 +
 test/confs/5004              |  1 +
 test/confs/5005              |  1 +
 test/confs/5006              |  1 +
 test/confs/5007              |  1 +
 test/confs/5008              |  1 +
 test/confs/5009              |  1 +
 test/confs/5050              |  1 +
 test/confs/5100              |  1 +
 test/confs/5101              |  1 +
 test/confs/5102              |  1 +
 test/confs/5103              |  1 +
 test/confs/5200              |  1 +
 test/confs/5201              |  1 +
 test/confs/5202              |  1 +
 test/confs/5203              |  1 +
 test/confs/5204              |  1 +
 test/confs/5205              |  1 +
 test/confs/5206              |  1 +
 test/confs/5207              |  1 +
 test/confs/5208              |  1 +
 test/confs/5209              |  1 +
 test/confs/5300              |  1 +
 test/confs/5301              |  1 +
 test/confs/5400              |  1 +
 test/confs/5401              |  1 +
 test/confs/5410              |  1 +
 test/confs/5420              |  1 +
 test/confs/5500              |  1 +
 test/confs/5510              |  1 +
 test/confs/5600              |  1 +
 test/confs/5601              |  1 +
 test/confs/5650              |  1 +
 test/confs/5651              |  1 +
 test/confs/5700              |  1 +
 test/confs/5710              |  1 +
 test/confs/5720              |  1 +
 test/confs/5730              |  1 +
 test/confs/5740              |  1 +
 test/confs/5800              |  1 +
 test/confs/5820              |  1 +
 test/confs/5840              |  1 +
 test/confs/5860              |  1 +
 test/confs/9000              |  1 +
 test/confs/9001              |  1 +
 test/confs/9100              |  1 +
 test/confs/9200              |  1 +
 test/confs/9300              |  1 +
 test/confs/9350              |  1 +
 test/confs/9400              |  1 +
 test/confs/9401              |  1 +
 test/confs/9402              |  1 +
 test/confs/9450              |  1 +
 test/confs/9900              |  1 +
 test/confs/9901              |  1 +
 test/confs/9902              |  1 +
 test/confs/9903              |  1 +
 test/paniclog/0013           |  2 +-
 test/paniclog/0148           |  2 +-
 test/paniclog/0236           |  2 +-
 test/paniclog/0290           |  2 +-
 test/paniclog/0348           |  8 +++---
 test/paniclog/0415           | 20 ++++++-------
 test/paniclog/0442           |  2 +-
 test/runtest                 | 25 +++++++++++++++--
 test/scripts/0000-Basic/0615 | 13 +++++++++
 test/scripts/0000-Basic/0616 |  1 +
 test/stderr/0002             | 15 ++++++++++
 test/stderr/0013             |  2 +-
 test/stderr/0148             |  2 +-
 test/stderr/0236             |  2 +-
 test/stderr/0290             |  2 +-
 test/stderr/0348             |  8 +++---
 test/stderr/0415             | 20 ++++++-------
 test/stderr/0442             |  2 +-
 test/stderr/0615             | 15 ++++++++++
 test/stdout/0572             |  1 +
 test/stdout/0615             |  4 +++
 test/stdout/0616             | 19 +++++++++++++
 850 files changed, 1143 insertions(+), 48 deletions(-)
 create mode 100644 src/src/environment.c
 create mode 100644 test/confs/0615
 create mode 100644 test/confs/0616
 create mode 100644 test/scripts/0000-Basic/0615
 create mode 120000 test/scripts/0000-Basic/0616
 create mode 100644 test/stderr/0615
 create mode 100644 test/stdout/0615
 create mode 100644 test/stdout/0616

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 758a0cf39..9d2316937 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -3151,6 +3151,11 @@ using one of the words &%router_list%&, &%transport_list%&, or
 settings can be obtained by using &%routers%&, &%transports%&, or
 &%authenticators%&.
 
+.cindex "environment"
+If &%environment%& is given as an argument, the set of environment
+variables is output, line by line. Using the &%-n%& flag supresses the value of the
+variables.
+
 .cindex "options" "macro &-- extracting"
 If invoked by an admin user, then &%macro%&, &%macro_list%& and &%macros%&
 are available, similarly to the drivers.  Because macros are sometimes used
@@ -3482,6 +3487,8 @@ name, but it can be a colon-separated list of names. In this case, the first
 file that exists is used. Failure to open an existing file stops Exim from
 proceeding any further along the list, and an error is generated.
 
+The file names need to be absolute names.
+
 When this option is used by a caller other than root, and the list is different
 from the compiled-in list, Exim gives up its root privilege immediately, and
 runs with the real and effective uid and gid set to those of the caller.
@@ -7739,7 +7746,7 @@ domain, host, address and local part lists.
 
 
 
-.section "Expansion of lists" "SECID75"
+.section "Expansion of lists" "SECTlistexpand"
 .cindex "expansion" "of lists"
 Each list is expanded as a single string before it is used. The result of
 expansion must be a list, possibly containing empty items, which is split up
@@ -13947,6 +13954,14 @@ received. See chapter &<<CHAPACL>>& for further details.
 This option defines the ACL that is run when an SMTP VRFY command is
 received. See chapter &<<CHAPACL>>& for further details.
 
+.new
+.option add_environment main "string list" empty
+.cindex "environment" "inherited"
+This option allows to set individual environment variables that the
+currently linked libraries and programs in child processes use. The
+default list is empty,
+.wen
+
 .option admin_groups main "string list&!!" unset
 .cindex "admin user"
 This option is expanded just once, at the start of Exim's processing. If the
@@ -15034,6 +15049,30 @@ process rather than a remote host, and is using &%-bs%& to inject the messages,
 .option ignore_fromline_local main boolean false
 See &%ignore_fromline_hosts%& above.
 
+.new
+.option keep_environment main "string list" unset
+.cindex "environment" "inherited"
+This option contains a string list of environment variables to keep.
+You have to trust these variables or you have to be sure that
+these variables do not impose any security risk. Keep in mind that
+during the startup phase Exim is running with an effective UID 0 in most
+installations. As the default value is an empty list, the default
+environment for using libraries, running embedded Perl code, or running
+external binaries is empty, and does not not even contain PATH or HOME.
+
+Actually the list is interpreted as a list of patterns
+(&<<SECTlistexpand>>&), except that it is not expanded first.
+
+WARNING: Macro substitution is still done first, so having a macro
+FOO and having FOO_HOME in your &%keep_environment%& option may have
+unexpected results. You may work around this using a regular expression
+that does not match the macro name: ^[F]OO_HOME$.
+
+Current versions of Exim issue a warning during startupif you do not mention
+&%keep_environment%& or &%add_environment%& in your runtime configuration
+file.
+.wen
+
 
 .option keep_malformed main time 4d
 This option specifies the length of time to keep messages whose spool files
@@ -16072,6 +16111,12 @@ it qualifies them only if the message came from a host that matches
 &%sender_unqualified_hosts%&, or if the message was submitted locally (not
 using TCP/IP), and the &%-bnq%& option was not set.
 
+.option set_environment main "string list" empty
+.cindex "environment"
+This option allows to set individual environment variables that the
+currently linked libraries and programs in child processes use. The
+default list is empty,
+
 
 .option slow_lookup_log main integer 0
 .cindex "logging" "slow lookups"
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 2f39532e7..7f8a62546 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -173,6 +173,7 @@ JH/41 Bug 1792: Fix selection of headers to sign for DKIM: bottom-up.  While
 
 JH/42 Bug 1796: Fix error logged on a malware scanner connection failure.
 
+HS/04 Add support for keep_environment and add_environment options.
 
 
 Exim version 4.86
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 9bc819dd7..e0bdeecfd 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -335,6 +335,7 @@ OBJ_EXIM = acl.o base64.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \
         rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o \
         route.o search.o sieve.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
         std-crypto.o store.o string.o tls.o tod.o transport.o tree.o verify.o \
+        environment.o \
         $(OBJ_LOOKUPS) \
         local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
         $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)
@@ -592,6 +593,7 @@ dns.o:           $(HDRS) dns.c
 enq.o:           $(HDRS) enq.c
 exim.o:          $(HDRS) exim.c
 expand.o:        $(HDRS) expand.c
+environment.o:   $(HDRS) environment.c
 filter.o:        $(HDRS) filter.c
 filtertest.o:    $(HDRS) filtertest.c
 globals.o:       $(HDRS) globals.c
diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index 886214030..9420b11c6 100755
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -101,7 +101,7 @@ for f in dbfunctions.h dbstuff.h exim.h functions.h globals.h local_scan.h \
   exim_dbutil.c exim_lock.c expand.c filter.c filtertest.c globals.c \
   header.c host.c ip.c log.c lss.c match.c moan.c parse.c perl.c queue.c \
   rda.c readconf.c receive.c retry.c rewrite.c rfc2047.c route.c search.c \
-  setenv.c \
+  setenv.c environment.c \
   sieve.c smtp_in.c smtp_out.c spool_in.c spool_out.c std-crypto.c store.c \
   string.c tls.c tlscert-gnu.c tlscert-openssl.c tls-gnu.c tls-openssl.c \
   tod.c transport.c tree.c verify.c version.c dkim.c dkim.h dmarc.c dmarc.h \
diff --git a/src/src/environment.c b/src/src/environment.c
new file mode 100644
index 000000000..aaa84f817
--- /dev/null
+++ b/src/src/environment.c
@@ -0,0 +1,54 @@
+/*************************************************
+*     Exim - an Internet mail transport agent    *
+*************************************************/
+
+/* Copyright (c) Heiko Schlittermann 2016
+ * hs@schlittermann.de
+ * See the file NOTICE for conditions of use and distribution.
+ */
+
+#include "exim.h"
+
+/* The cleanup_environment() function is used during the startup phase
+of the Exim process, right after reading the configurations main
+part, before any expansions take place. It retains the environment
+variables we trust (via the keep_environment option) and allows to
+set additional variables (via add_environment).
+
+Returns:    TRUE if successful
+            FALSE otherwise
+*/
+
+BOOL
+cleanup_environment()
+{
+if (!keep_environment || *keep_environment == '\0')
+  clearenv();
+else if (Ustrcmp(keep_environment, "*") != 0)
+  {
+  uschar **p;
+  if (environ) for (p = USS environ; *p; /* see below */)
+    {
+    uschar *name = string_copyn(*p, US Ustrchr(*p, '=') - *p);
+
+    if (OK != match_isinlist(name, CUSS &keep_environment,
+        0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
+      if (unsetenv(CS name) < 0) return FALSE;
+      else /* nothing */;
+    else
+      p++;
+
+    store_reset(name);
+    }
+  }
+if (add_environment)
+  {
+    uschar *p;
+    int sep = 0;
+    const uschar* envlist = add_environment;
+    while ((p = string_nextinlist(&envlist, &sep, NULL, 0)))
+        putenv(CS p);
+  }
+
+  return TRUE;
+}
diff --git a/src/src/exim.c b/src/src/exim.c
index 02f2a9a4d..d6f2d4aac 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -3743,8 +3743,19 @@ if (running_in_test_harness) smtputf8_advertise_hosts = NULL;
 is a failure. It leaves the configuration file open so that the subsequent
 configuration data for delivery can be read if needed. */
 
+/* To be safe: change the working directory to /. */
+if (Uchdir("/") < 0)
+  {
+    perror("exim: chdir `/': ");
+    exit(EXIT_FAILURE);
+  }
+
 readconf_main();
 
+if (cleanup_environment() == FALSE)
+  log_write(0, LOG_PANIC_DIE, "Can't cleanup environment");
+
+
 /* If an action on specific messages is requested, or if a daemon or queue
 runner is being started, we need to know if Exim was called by an admin user.
 This is the case if the real user is root or exim, or if the real group is
@@ -3907,7 +3918,7 @@ EXIM_TMPDIR by the build scripts.
 #ifdef EXIM_TMPDIR
   {
   uschar **p;
-  for (p = USS environ; *p != NULL; p++)
+  if (environ) for (p = USS environ; *p != NULL; p++)
     {
     if (Ustrncmp(*p, "TMPDIR=", 7) == 0 &&
         Ustrcmp(*p+7, EXIM_TMPDIR) != 0)
@@ -3947,10 +3958,10 @@ else
     uschar **new;
     uschar **newp;
     int count = 0;
-    while (*p++ != NULL) count++;
+    if (environ) while (*p++ != NULL) count++;
     if (envtz == NULL) count++;
     newp = new = malloc(sizeof(uschar *) * (count + 1));
-    for (p = USS environ; *p != NULL; p++)
+    if (environ) for (p = USS environ; *p != NULL; p++)
       {
       if (Ustrncmp(*p, "TZ=", 3) == 0) continue;
       *newp++ = *p;
@@ -4540,7 +4551,8 @@ if (list_options)
           (Ustrcmp(argv[i], "router") == 0 ||
            Ustrcmp(argv[i], "transport") == 0 ||
            Ustrcmp(argv[i], "authenticator") == 0 ||
-           Ustrcmp(argv[i], "macro") == 0))
+           Ustrcmp(argv[i], "macro") == 0 ||
+           Ustrcmp(argv[i], "environment") == 0))
         {
         readconf_print(argv[i+1], argv[i], flag_n);
         i++;
diff --git a/src/src/functions.h b/src/src/functions.h
index 97d95dd3d..a4c791f10 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -108,6 +108,7 @@ extern int     check_host(void *, const uschar *, const uschar **, uschar **);
 extern uschar **child_exec_exim(int, BOOL, int *, BOOL, int, ...);
 extern pid_t   child_open_uid(const uschar **, const uschar **, int,
 		 uid_t *, gid_t *, int *, int *, uschar *, BOOL);
+extern BOOL    cleanup_environment(void);
 extern uschar *cutthrough_finaldot(void);
 extern BOOL    cutthrough_flush_send(void);
 extern BOOL    cutthrough_headers_send(void);
@@ -418,6 +419,7 @@ extern uschar *string_append_listele(uschar *, uschar, const uschar *);
 extern uschar *string_append_listele_n(uschar *, uschar, const uschar *, unsigned);
 extern uschar *string_base62(unsigned long int);
 extern uschar *string_cat(uschar *, int *, int *, const uschar *, int);
+extern int     string_compare_by_pointer(const uschar **, const uschar **);
 extern uschar *string_copy_dnsdomain(uschar *);
 extern uschar *string_copy_malloc(const uschar *);
 extern uschar *string_copylc(const uschar *);
diff --git a/src/src/globals.c b/src/src/globals.c
index 69f217642..e5bbb8340 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -321,6 +321,7 @@ uschar *acl_wherecodes[]       = { US"550",     /* RCPT */
 BOOL    active_local_from_check = FALSE;
 BOOL    active_local_sender_retain = FALSE;
 BOOL    accept_8bitmime        = TRUE; /* deliberately not RFC compliant */
+uschar *add_environment        = NULL;
 address_item  *addr_duplicate  = NULL;
 
 address_item address_defaults = {
@@ -803,6 +804,8 @@ uschar *iterate_item           = NULL;
 
 int     journal_fd             = -1;
 
+uschar *keep_environment       = NULL;
+
 int     keep_malformed         = 4*24*60*60;    /* 4 days */
 
 uschar *eldap_dn               = NULL;
diff --git a/src/src/globals.h b/src/src/globals.h
index 787de41f0..1919d8c1f 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -156,6 +156,7 @@ extern const uschar **address_expansions[ADDRESS_EXPANSIONS_COUNT];
 /* General global variables */
 
 extern BOOL    accept_8bitmime;        /* Allow *BITMIME incoming */
+extern uschar *add_environment;        /* List of environment variables to add */
 extern header_line *acl_added_headers; /* Headers added by an ACL */
 extern tree_node *acl_anchor;          /* Tree of named ACLs */
 extern uschar *acl_arg[9];             /* Argument to ACL call */
@@ -516,6 +517,7 @@ extern uschar *iterate_item;           /* Item from iterate list */
 
 extern int     journal_fd;             /* Fd for journal file */
 
+extern uschar *keep_environment;       /* Whitelist for environment variables */
 extern int     keep_malformed;         /* Time to keep malformed messages */
 
 extern uschar *eldap_dn;               /* Where LDAP DNs are left */
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 9de064d95..cf5f069e9 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -178,6 +178,7 @@ static optionlist optionlist_config[] = {
   { "acl_smtp_starttls",        opt_stringptr,   &acl_smtp_starttls },
 #endif
   { "acl_smtp_vrfy",            opt_stringptr,   &acl_smtp_vrfy },
+  { "add_environment",          opt_stringptr,   &add_environment },
   { "admin_groups",             opt_gidlist,     &admin_groups },
   { "allow_domain_literals",    opt_bool,        &allow_domain_literals },
   { "allow_mx_to_ip",           opt_bool,        &allow_mx_to_ip },
@@ -296,6 +297,7 @@ static optionlist optionlist_config[] = {
   { "ignore_bounce_errors_after", opt_time,      &ignore_bounce_errors_after },
   { "ignore_fromline_hosts",    opt_stringptr,   &ignore_fromline_hosts },
   { "ignore_fromline_local",    opt_bool,        &ignore_fromline_local },
+  { "keep_environment",         opt_stringptr,   &keep_environment },
   { "keep_malformed",           opt_time,        &keep_malformed },
 #ifdef LOOKUP_LDAP
   { "ldap_ca_cert_dir",         opt_stringptr,   &eldap_ca_cert_dir },
@@ -2549,6 +2551,7 @@ second argument is NULL. There are some special values:
   +name              print a named list item
   local_scan         print the local_scan options
   config             print the configuration as it is parsed
+  environment        print the used execution environment
 
 If the second argument is not NULL, it must be one of "router", "transport",
 "authenticator" or "macro" in which case the first argument identifies the
@@ -2697,6 +2700,25 @@ if (type == NULL)
     names_only = TRUE;
     }
 
+  else if (Ustrcmp(name, "environment") == 0)
+    {
+    if (environ)
+      {
+      uschar **p;
+      size_t n;
+      for (p = USS environ; *p; p++) ;
+      n = p - USS environ;
+      qsort(environ, p - USS environ, sizeof(*p), (__compar_fn_t) string_compare_by_pointer);
+
+      for (p = USS environ; *p; p++)
+        {
+        if (no_labels) *(Ustrchr(*p, '=')) = '\0';
+        puts(*p);
+        }
+      }
+    return;
+    }
+
   else
     {
     print_ol(find_option(name, optionlist_config, optionlist_config_size),
@@ -3022,6 +3044,15 @@ const uschar *list = config_main_filelist;
 while((filename = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))
        != NULL)
   {
+
+  /* To avoid confusion: Exim changes to / at the very beginning and
+   * and to $spool_directory later. */
+  if (filename[0] != '/')
+    {
+    fprintf(stderr, "-C %s: only absolute names are allowed\n", filename);
+    exit(EXIT_FAILURE);
+  }
+
   /* Cut out all the fancy processing unless specifically wanted */
 
   #if defined(CONFIGURE_FILE_USE_NODE) || defined(CONFIGURE_FILE_USE_EUID)
@@ -3467,6 +3498,11 @@ if (gnutls_require_kx || gnutls_require_mac || gnutls_require_proto)
       " gnutls_require_kx, gnutls_require_mac and gnutls_require_protocols"
       " are obsolete\n");
 #endif	/*SUPPORT_TLS*/
+
+if ((!add_environment || *add_environment == '\0') && !keep_environment)
+  log_write(0, LOG_MAIN,
+      "WARNING: purging the environment.\n"
+      " Suggested action: use keep_environment and add_environment.\n");
 }
 
 
diff --git a/src/src/setenv.c b/src/src/setenv.c
index 6da56d58d..eefbec09b 100644
--- a/src/src/setenv.c
+++ b/src/src/setenv.c
@@ -34,6 +34,9 @@ if (!name)
   return -1;
   }
 
+if (!environ)
+  return 0;
+
 for (end = name; *end != '=' && *end; ) end++;
 len = end - name;
   
diff --git a/src/src/string.c b/src/src/string.c
index c0dfd04b6..1c4ba121c 100644
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -1707,6 +1707,17 @@ return yield;
 #endif  /* COMPILE_UTILITY */
 
 
+#ifndef COMPILE_UTILITY
+/* qsort(3), currently used to sort the environment variables
+for -bP environment output, needs a function to compare two pointers to string
+pointers. Here it is. */
+
+int
+string_compare_by_pointer(const uschar **a, const uschar **b)
+{
+return Ustrcmp(CUS *a, CUS *b);
+}
+#endif /* COMPILE_UTILITY */
 
 
 
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 4f02d078f..83594c973 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -897,7 +897,7 @@ bad:
     {
     extern char ** environ;
     uschar ** p;
-    for (p = USS environ; *p != NULL; p++)
+    if (environ) for (p = USS environ; *p != NULL; p++)
       if (Ustrncmp(*p, "EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK", 42) == 0)
 	{
 	DEBUG(D_tls) debug_printf("Supplying known bad OCSP response\n");
diff --git a/test/confs/0000 b/test/confs/0000
index 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..0daf053bd 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
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..ccf723761 100644
--- a/test/confs/0003
+++ b/test/confs/0003
@@ -1,6 +1,7 @@
 # Exim test configuration 0003
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0004 b/test/confs/0004
index 8faf1c60a..12cd8dba9 100644
--- a/test/confs/0004
+++ b/test/confs/0004
@@ -1,6 +1,7 @@
 # Exim test configuration 0004
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0005 b/test/confs/0005
index de20203a3..b503b81a5 100644
--- a/test/confs/0005
+++ b/test/confs/0005
@@ -1,6 +1,7 @@
 # Exim test configuration 0005
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0006 b/test/confs/0006
index 597c6bafb..4cd84a275 100644
--- a/test/confs/0006
+++ b/test/confs/0006
@@ -1,6 +1,7 @@
 # Exim test configuration 0006
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0007 b/test/confs/0007
index e31fd4c5c..910c5a7f0 100644
--- a/test/confs/0007
+++ b/test/confs/0007
@@ -1,6 +1,7 @@
 # Exim test configuration 0007
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0008 b/test/confs/0008
index 1a3ce395f..de228d31e 100644
--- a/test/confs/0008
+++ b/test/confs/0008
@@ -1,6 +1,7 @@
 # Exim test configuration 0008
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0009 b/test/confs/0009
index ce366fd38..34dee6e0a 100644
--- a/test/confs/0009
+++ b/test/confs/0009
@@ -1,6 +1,7 @@
 # Exim test configuration 0009
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0010 b/test/confs/0010
index 074928a87..9bf862dd4 100644
--- a/test/confs/0010
+++ b/test/confs/0010
@@ -1,6 +1,7 @@
 # Exim test configuration 0010
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0011 b/test/confs/0011
index 53864399f..f1aa77a5e 100644
--- a/test/confs/0011
+++ b/test/confs/0011
@@ -1,6 +1,7 @@
 # Exim test configuration 0011
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0012 b/test/confs/0012
index 7b07d27fc..7df08cb09 100644
--- a/test/confs/0012
+++ b/test/confs/0012
@@ -1,6 +1,7 @@
 # Exim test configuration 0012
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0013 b/test/confs/0013
index bc266e5fd..61f0d579d 100644
--- a/test/confs/0013
+++ b/test/confs/0013
@@ -1,6 +1,7 @@
 # Exim test configuration 0013
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0014 b/test/confs/0014
index da0abb449..7f15c4108 100644
--- a/test/confs/0014
+++ b/test/confs/0014
@@ -1,6 +1,7 @@
 # Exim test configuration 0014
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0015 b/test/confs/0015
index 04dc46cf2..593c29555 100644
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -1,6 +1,7 @@
 # Exim test configuration 0015
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0016 b/test/confs/0016
index d68778639..7001b9774 100644
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -1,6 +1,7 @@
 # Exim test configuration 0016
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0017 b/test/confs/0017
index c1b94ccd0..6e36a38ea 100644
--- a/test/confs/0017
+++ b/test/confs/0017
@@ -1,6 +1,7 @@
 # Exim test configuration 0017
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0018 b/test/confs/0018
index 1eb1b08f7..6fbfb4342 100644
--- a/test/confs/0018
+++ b/test/confs/0018
@@ -1,6 +1,7 @@
 # Exim test configuration 0018
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0019 b/test/confs/0019
index 2ca5d5893..5757c1cf6 100644
--- a/test/confs/0019
+++ b/test/confs/0019
@@ -1,6 +1,7 @@
 # Exim test configuration 2409
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0020 b/test/confs/0020
index 1182e6a84..6672ccf2f 100644
--- a/test/confs/0020
+++ b/test/confs/0020
@@ -1,6 +1,7 @@
 # Exim test configuration 0020
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0021 b/test/confs/0021
index 31cf2c670..c48c0e08e 100644
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -4,6 +4,7 @@ SERVER=
 BR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0022 b/test/confs/0022
index e2ebe66f9..7a2742790 100644
--- a/test/confs/0022
+++ b/test/confs/0022
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0023 b/test/confs/0023
index 0883bffa4..b59a52f92 100644
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -3,6 +3,7 @@
 LOG_SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0024 b/test/confs/0024
index 0d5578423..ee60a322e 100644
--- a/test/confs/0024
+++ b/test/confs/0024
@@ -1,6 +1,7 @@
 # Exim test configuration 0024
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0025 b/test/confs/0025
index a655d5f88..6477950be 100644
--- a/test/confs/0025
+++ b/test/confs/0025
@@ -1,6 +1,7 @@
 # Exim test configuration 0025
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0026 b/test/confs/0026
index f40587980..2b1763f87 100644
--- a/test/confs/0026
+++ b/test/confs/0026
@@ -1,6 +1,7 @@
 # Exim test configuration 0026
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0027 b/test/confs/0027
index b508a5b65..f671831b0 100644
--- a/test/confs/0027
+++ b/test/confs/0027
@@ -1,6 +1,7 @@
 # Exim test configuration 0027
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0028 b/test/confs/0028
index cc0784b06..6308f8358 100644
--- a/test/confs/0028
+++ b/test/confs/0028
@@ -1,6 +1,7 @@
 # Exim test configuration 0028
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0029 b/test/confs/0029
index a4eb1b1db..d65cf1181 100644
--- a/test/confs/0029
+++ b/test/confs/0029
@@ -1,6 +1,7 @@
 # Exim test configuration 0029
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0030 b/test/confs/0030
index c7c5f0867..89ced1f25 100644
--- a/test/confs/0030
+++ b/test/confs/0030
@@ -1,6 +1,7 @@
 # Exim test configuration 0030
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0031 b/test/confs/0031
index 0328320ca..2716b59cb 100644
--- a/test/confs/0031
+++ b/test/confs/0031
@@ -1,6 +1,7 @@
 # Exim test configuration 0031
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0032 b/test/confs/0032
index 1648fd217..8368f155a 100644
--- a/test/confs/0032
+++ b/test/confs/0032
@@ -1,6 +1,7 @@
 # Exim test configuration 0032
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0033 b/test/confs/0033
index 9e95388c3..825126bb7 100644
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -1,6 +1,7 @@
 # Exim test configuration 0033
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0034 b/test/confs/0034
index e5f7931c3..8dbe9ea1d 100644
--- a/test/confs/0034
+++ b/test/confs/0034
@@ -1,6 +1,7 @@
 # Exim test configuration 0034
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0035 b/test/confs/0035
index 36ad12a83..a8cd5c66a 100644
--- a/test/confs/0035
+++ b/test/confs/0035
@@ -4,6 +4,7 @@ SERVER=
 SUBMISSION_OPTIONS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0036 b/test/confs/0036
index 0c5044445..7d54acbee 100644
--- a/test/confs/0036
+++ b/test/confs/0036
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0037 b/test/confs/0037
index 98ef4d3d4..56323db4b 100644
--- a/test/confs/0037
+++ b/test/confs/0037
@@ -3,6 +3,7 @@
 FILTER_PREPEND_HOME=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0038 b/test/confs/0038
index 514af9e8a..b95b140b5 100644
--- a/test/confs/0038
+++ b/test/confs/0038
@@ -5,6 +5,7 @@ DRATELIMIT=0/1h/per_byte/strict
 ACLRCPT=check_rcpt
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0039 b/test/confs/0039
index f8ad999f5..5ca25b2e4 100644
--- a/test/confs/0039
+++ b/test/confs/0039
@@ -3,6 +3,7 @@
 QDG=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0040 b/test/confs/0040
index 71f903845..88b63f1f7 100644
--- a/test/confs/0040
+++ b/test/confs/0040
@@ -1,6 +1,7 @@
 # Exim test configuration 0040
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0041 b/test/confs/0041
index ec1067584..e0b820fb2 100644
--- a/test/confs/0041
+++ b/test/confs/0041
@@ -1,6 +1,7 @@
 # Exim test configuration 0041
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0042 b/test/confs/0042
index c65be6f99..a4a81bfbe 100644
--- a/test/confs/0042
+++ b/test/confs/0042
@@ -1,6 +1,7 @@
 # Exim test configuration 0042
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0043 b/test/confs/0043
index eaa13a859..4db392cd1 100644
--- a/test/confs/0043
+++ b/test/confs/0043
@@ -1,6 +1,7 @@
 # Exim test configuration 0043
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0044 b/test/confs/0044
index 963a55ea3..9e3f020c9 100644
--- a/test/confs/0044
+++ b/test/confs/0044
@@ -1,6 +1,7 @@
 # Exim test configuration 0044
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0045 b/test/confs/0045
index 764a7f213..f8caf1419 100644
--- a/test/confs/0045
+++ b/test/confs/0045
@@ -1,6 +1,7 @@
 # Exim test configuration 0045
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0046 b/test/confs/0046
index a64d3d9ea..4e7ff862a 100644
--- a/test/confs/0046
+++ b/test/confs/0046
@@ -3,6 +3,7 @@
 NL=FALSE
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0047 b/test/confs/0047
index ff8aea173..5e7d27d97 100644
--- a/test/confs/0047
+++ b/test/confs/0047
@@ -1,6 +1,7 @@
 # Exim test configuration 0047
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0048 b/test/confs/0048
index c15945f98..86560d587 100644
--- a/test/confs/0048
+++ b/test/confs/0048
@@ -3,6 +3,7 @@
 MESSAGE_LOGS = true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0049 b/test/confs/0049
index 4dc39d87b..0de91eeed 100644
--- a/test/confs/0049
+++ b/test/confs/0049
@@ -1,6 +1,7 @@
 # Exim test configuration 0049
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0050 b/test/confs/0050
index 47869246c..f709ad674 100644
--- a/test/confs/0050
+++ b/test/confs/0050
@@ -1,6 +1,7 @@
 # Exim test configuration 0050
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0051 b/test/confs/0051
index af1e10acd..34016ab81 100644
--- a/test/confs/0051
+++ b/test/confs/0051
@@ -1,6 +1,7 @@
 # Exim test configuration 0051
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0052 b/test/confs/0052
index 3b36daf04..2e2c13133 100644
--- a/test/confs/0052
+++ b/test/confs/0052
@@ -1,6 +1,7 @@
 # Exim test configuration 0052
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0053 b/test/confs/0053
index 0e6a98546..16702ffeb 100644
--- a/test/confs/0053
+++ b/test/confs/0053
@@ -1,6 +1,7 @@
 # Exim test configuration 0053
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0054 b/test/confs/0054
index 13ca588a4..ee63ec24b 100644
--- a/test/confs/0054
+++ b/test/confs/0054
@@ -1,6 +1,7 @@
 # Exim test configuration 0054
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0055 b/test/confs/0055
index 0c64561b3..ce1b22514 100644
--- a/test/confs/0055
+++ b/test/confs/0055
@@ -1,6 +1,7 @@
 # Exim test configuration 0055
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0056 b/test/confs/0056
index cc151dd70..299448369 100644
--- a/test/confs/0056
+++ b/test/confs/0056
@@ -1,6 +1,7 @@
 # Exim test configuration 0056
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0057 b/test/confs/0057
index 2b13c187d..f2bc88f8a 100644
--- a/test/confs/0057
+++ b/test/confs/0057
@@ -1,6 +1,7 @@
 # Exim test configuration 0057
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0058 b/test/confs/0058
index 4c3472379..2b15f6290 100644
--- a/test/confs/0058
+++ b/test/confs/0058
@@ -1,6 +1,7 @@
 # Exim test configuration 0058
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0059 b/test/confs/0059
index 6c771f1d2..f591bf6b3 100644
--- a/test/confs/0059
+++ b/test/confs/0059
@@ -1,6 +1,7 @@
 # Exim test configuration 0059
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0060 b/test/confs/0060
index c17f00372..8ce8d1012 100644
--- a/test/confs/0060
+++ b/test/confs/0060
@@ -1,6 +1,7 @@
 # Exim test configuration 0060
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0061 b/test/confs/0061
index 5f8521499..70d21834e 100644
--- a/test/confs/0061
+++ b/test/confs/0061
@@ -1,6 +1,7 @@
 # Exim test configuration 0061
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = ten-1.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0062 b/test/confs/0062
index 3e3ee757d..7e6474655 100644
--- a/test/confs/0062
+++ b/test/confs/0062
@@ -1,6 +1,7 @@
 # Exim test configuration 0062
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0063 b/test/confs/0063
index e832aa81a..be66b1a3f 100644
--- a/test/confs/0063
+++ b/test/confs/0063
@@ -1,6 +1,7 @@
 # Exim test configuration 0063
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0064 b/test/confs/0064
index 5046f2375..4feaed25d 100644
--- a/test/confs/0064
+++ b/test/confs/0064
@@ -1,6 +1,7 @@
 # Exim test configuration 0064
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0065 b/test/confs/0065
index 47b90b199..7d08f9640 100644
--- a/test/confs/0065
+++ b/test/confs/0065
@@ -1,6 +1,7 @@
 # Exim test configuration 0065
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0066 b/test/confs/0066
index 6271d5a0d..959b878e3 100644
--- a/test/confs/0066
+++ b/test/confs/0066
@@ -1,6 +1,7 @@
 # Exim test configuration 0066
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0067 b/test/confs/0067
index de9a0db9c..ac2af9c19 100644
--- a/test/confs/0067
+++ b/test/confs/0067
@@ -1,6 +1,7 @@
 # Exim test configuration 0067
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0068 b/test/confs/0068
index f4239beea..2de360fbd 100644
--- a/test/confs/0068
+++ b/test/confs/0068
@@ -1,6 +1,7 @@
 # Exim test configuration 0068
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0069 b/test/confs/0069
index 3514a1ea1..23685e40e 100644
--- a/test/confs/0069
+++ b/test/confs/0069
@@ -3,6 +3,7 @@
 LOG_SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0070 b/test/confs/0070
index 1c439b72b..4ffe3668c 100644
--- a/test/confs/0070
+++ b/test/confs/0070
@@ -3,6 +3,7 @@
 HVH=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0071 b/test/confs/0071
index 00d45578a..e18ab0bbf 100644
--- a/test/confs/0071
+++ b/test/confs/0071
@@ -1,6 +1,7 @@
 # Exim test configuration 0071
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0072 b/test/confs/0072
index 69ad904cd..94c4dcbe5 100644
--- a/test/confs/0072
+++ b/test/confs/0072
@@ -5,6 +5,7 @@ ONLY=
 RETURN=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0073 b/test/confs/0073
index dfea2c293..f6c18247d 100644
--- a/test/confs/0073
+++ b/test/confs/0073
@@ -1,6 +1,7 @@
 # Exim test configuration 0073
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0074 b/test/confs/0074
index c967ba27c..ab3007455 100644
--- a/test/confs/0074
+++ b/test/confs/0074
@@ -1,6 +1,7 @@
 # Exim test configuration 0074
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0075 b/test/confs/0075
index e4a6fdfca..cb9d472ff 100644
--- a/test/confs/0075
+++ b/test/confs/0075
@@ -1,6 +1,7 @@
 # Exim test configuration 0075
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0076 b/test/confs/0076
index 840fde7e3..bd3863cf7 100644
--- a/test/confs/0076
+++ b/test/confs/0076
@@ -1,6 +1,7 @@
 # Exim test configuration 0076
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0077 b/test/confs/0077
index 18edff925..b2138536e 100644
--- a/test/confs/0077
+++ b/test/confs/0077
@@ -1,6 +1,7 @@
 # Exim test configuration 0077
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0078 b/test/confs/0078
index 7955d10c5..1be361abd 100644
--- a/test/confs/0078
+++ b/test/confs/0078
@@ -1,6 +1,7 @@
 # Exim test configuration 0078
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0079 b/test/confs/0079
index 3279e52e8..f9be08244 100644
--- a/test/confs/0079
+++ b/test/confs/0079
@@ -1,6 +1,7 @@
 # Exim test configuration 0079
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0080 b/test/confs/0080
index fc5f82449..4bc2e3a3b 100644
--- a/test/confs/0080
+++ b/test/confs/0080
@@ -1,6 +1,7 @@
 # Exim test configuration 0080
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0081 b/test/confs/0081
index 29a35862b..4e2f4949e 100644
--- a/test/confs/0081
+++ b/test/confs/0081
@@ -1,6 +1,7 @@
 # Exim test configuration 0081
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0082 b/test/confs/0082
index 7219daf2d..b4bfc7693 100644
--- a/test/confs/0082
+++ b/test/confs/0082
@@ -1,6 +1,7 @@
 # Exim test configuration 0082
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0083 b/test/confs/0083
index e7b1a0486..37c7bac2e 100644
--- a/test/confs/0083
+++ b/test/confs/0083
@@ -1,6 +1,7 @@
 # Exim test configuration 0083
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0084 b/test/confs/0084
index 44e57633d..b4530996f 100644
--- a/test/confs/0084
+++ b/test/confs/0084
@@ -1,6 +1,7 @@
 # Exim test configuration 0084
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0085 b/test/confs/0085
index efd52533c..0a74e1591 100644
--- a/test/confs/0085
+++ b/test/confs/0085
@@ -1,6 +1,7 @@
 # Exim test configuration 0085
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0086 b/test/confs/0086
index f512e3194..256cc6047 100644
--- a/test/confs/0086
+++ b/test/confs/0086
@@ -1,6 +1,7 @@
 # Exim test configuration 0086
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0087 b/test/confs/0087
index 2e8200a3d..f59143e3f 100644
--- a/test/confs/0087
+++ b/test/confs/0087
@@ -1,6 +1,7 @@
 # Exim test configuration 0087
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0088 b/test/confs/0088
index 13f0ffc62..0c1d5884e 100644
--- a/test/confs/0088
+++ b/test/confs/0088
@@ -1,6 +1,7 @@
 # Exim test configuration 0088
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0089 b/test/confs/0089
index 4b6bc6500..ccb0283e2 100644
--- a/test/confs/0089
+++ b/test/confs/0089
@@ -1,6 +1,7 @@
 # Exim test configuration 0089
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0090 b/test/confs/0090
index 735ea021a..3612e8aa8 100644
--- a/test/confs/0090
+++ b/test/confs/0090
@@ -1,6 +1,7 @@
 # Exim test configuration 0090
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0091 b/test/confs/0091
index 58bd6df71..3dcc12b0a 100644
--- a/test/confs/0091
+++ b/test/confs/0091
@@ -1,6 +1,7 @@
 # Exim test configuration 0091
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0092 b/test/confs/0092
index e0c221bbf..8497dc044 100644
--- a/test/confs/0092
+++ b/test/confs/0092
@@ -8,6 +8,7 @@ domainlist local_domains = test.ex : *.test.ex
 domainlist relay_domains = test.ex
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0093 b/test/confs/0093
index e94481518..0cdc58b38 100644
--- a/test/confs/0093
+++ b/test/confs/0093
@@ -1,6 +1,7 @@
 # Exim test configuration 0093
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0094 b/test/confs/0094
index 79825c758..b586dc434 100644
--- a/test/confs/0094
+++ b/test/confs/0094
@@ -1,6 +1,7 @@
 # Exim test configuration 0094
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0095 b/test/confs/0095
index ba3e7b805..fb79c9d28 100644
--- a/test/confs/0095
+++ b/test/confs/0095
@@ -4,6 +4,7 @@ ERT=
 QWM=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0096 b/test/confs/0096
index 074dc2fd4..5ef2ec20e 100644
--- a/test/confs/0096
+++ b/test/confs/0096
@@ -1,6 +1,7 @@
 # Exim test configuration 0096
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0097 b/test/confs/0097
index 3c711253a..2ad1b5e1f 100644
--- a/test/confs/0097
+++ b/test/confs/0097
@@ -1,6 +1,7 @@
 # Exim test configuration 0097
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0098 b/test/confs/0098
index 03f94ac37..60402deaf 100644
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -3,6 +3,7 @@
 WMF=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0099 b/test/confs/0099
index 0b4c1372b..122856ce7 100644
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -3,6 +3,7 @@
 RETRY =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0100 b/test/confs/0100
index d9843d074..55cd947b5 100644
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -1,6 +1,7 @@
 # Exim test configuration 0100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0101 b/test/confs/0101
index 3b421a755..05832fb45 100644
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -1,6 +1,7 @@
 # Exim test configuration 0101
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0102 b/test/confs/0102
index e9e7512df..ac33f72f4 100644
--- a/test/confs/0102
+++ b/test/confs/0102
@@ -1,6 +1,7 @@
 # Exim test configuration 0102
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0103 b/test/confs/0103
index 63311a21a..9d40134e7 100644
--- a/test/confs/0103
+++ b/test/confs/0103
@@ -1,6 +1,7 @@
 # Exim test configuration 0103
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0104 b/test/confs/0104
index 18ce0b046..6101f0c1c 100644
--- a/test/confs/0104
+++ b/test/confs/0104
@@ -1,6 +1,7 @@
 # Exim test configuration 0104
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0105 b/test/confs/0105
index 3cc1a80e9..a6763313f 100644
--- a/test/confs/0105
+++ b/test/confs/0105
@@ -1,6 +1,7 @@
 # Exim test configuration 0105
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0106 b/test/confs/0106
index faaccd0c8..52130ede0 100644
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -1,6 +1,7 @@
 # Exim test configuration 0106
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0107 b/test/confs/0107
index 72bc6c5c2..06e7b83ae 100644
--- a/test/confs/0107
+++ b/test/confs/0107
@@ -1,6 +1,7 @@
 # Exim test configuration 0107
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0108 b/test/confs/0108
index f8e5d0b12..37c53de6e 100644
--- a/test/confs/0108
+++ b/test/confs/0108
@@ -1,6 +1,7 @@
 # Exim test configuration 0108
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0109 b/test/confs/0109
index ebc53295d..38401bdb9 100644
--- a/test/confs/0109
+++ b/test/confs/0109
@@ -1,6 +1,7 @@
 # Exim test configuration 0109
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0110 b/test/confs/0110
index 63377228c..d8fb4a9e7 100644
--- a/test/confs/0110
+++ b/test/confs/0110
@@ -1,6 +1,7 @@
 # Exim test configuration 0110
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0111 b/test/confs/0111
index 9a840e956..377a9a062 100644
--- a/test/confs/0111
+++ b/test/confs/0111
@@ -1,6 +1,7 @@
 # Exim test configuration 0111
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0112 b/test/confs/0112
index 312baae73..bb133227f 100644
--- a/test/confs/0112
+++ b/test/confs/0112
@@ -1,6 +1,7 @@
 # Exim test configuration 0112
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0113 b/test/confs/0113
index a5bc653fc..a24c029b5 100644
--- a/test/confs/0113
+++ b/test/confs/0113
@@ -1,6 +1,7 @@
 # Exim test configuration 0113
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0114 b/test/confs/0114
index 10cf42a82..acaf05c03 100644
--- a/test/confs/0114
+++ b/test/confs/0114
@@ -1,6 +1,7 @@
 # Exim test configuration 0114
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0115 b/test/confs/0115
index aaf04e501..ad4d469a1 100644
--- a/test/confs/0115
+++ b/test/confs/0115
@@ -1,6 +1,7 @@
 # Exim test configuration 0115
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0116 b/test/confs/0116
index e657b11c2..da70ac0e5 100644
--- a/test/confs/0116
+++ b/test/confs/0116
@@ -1,6 +1,7 @@
 # Exim test configuration 0116
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0117 b/test/confs/0117
index f80fc9ae5..f0bcd89f3 100644
--- a/test/confs/0117
+++ b/test/confs/0117
@@ -1,6 +1,7 @@
 # Exim test configuration 0117
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0118 b/test/confs/0118
index 45b9f79e4..0223df01f 100644
--- a/test/confs/0118
+++ b/test/confs/0118
@@ -1,6 +1,7 @@
 # Exim test configuration 0118
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0119 b/test/confs/0119
index f33253242..74cd7ae2c 100644
--- a/test/confs/0119
+++ b/test/confs/0119
@@ -1,6 +1,7 @@
 # Exim test configuration 0119
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0120 b/test/confs/0120
index 6ede1ee4e..ddba4d32d 100644
--- a/test/confs/0120
+++ b/test/confs/0120
@@ -1,6 +1,7 @@
 # Exim test configuration 0120
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0121 b/test/confs/0121
index 6c6f65d3a..3d5e84721 100644
--- a/test/confs/0121
+++ b/test/confs/0121
@@ -1,6 +1,7 @@
 # Exim test configuration 0121
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0122 b/test/confs/0122
index 8ed176fe3..bec8032f7 100644
--- a/test/confs/0122
+++ b/test/confs/0122
@@ -1,6 +1,7 @@
 # Exim test configuration 0122
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0123 b/test/confs/0123
index fc8ded626..250ac1d16 100644
--- a/test/confs/0123
+++ b/test/confs/0123
@@ -1,6 +1,7 @@
 # Exim test configuration 0123
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0124 b/test/confs/0124
index 8dff37eeb..5cc803841 100644
--- a/test/confs/0124
+++ b/test/confs/0124
@@ -1,6 +1,7 @@
 # Exim test configuration 0124
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0125 b/test/confs/0125
index 23547965f..9bc55c728 100644
--- a/test/confs/0125
+++ b/test/confs/0125
@@ -1,6 +1,7 @@
 # Exim test configuration 0125
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0126 b/test/confs/0126
index 5b4bb9c3b..8a8474aa3 100644
--- a/test/confs/0126
+++ b/test/confs/0126
@@ -1,6 +1,7 @@
 # Exim test configuration 0126
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0127 b/test/confs/0127
index f3dbe76e6..33c72e352 100644
--- a/test/confs/0127
+++ b/test/confs/0127
@@ -1,6 +1,7 @@
 # Exim test configuration 0127
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0128 b/test/confs/0128
index f81392e9c..d0e8cc4c4 100644
--- a/test/confs/0128
+++ b/test/confs/0128
@@ -1,6 +1,7 @@
 # Exim test configuration 0128
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0129 b/test/confs/0129
index 0fe74070b..378a6b904 100644
--- a/test/confs/0129
+++ b/test/confs/0129
@@ -1,6 +1,7 @@
 # Exim test configuration 0129
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0130 b/test/confs/0130
index c6dfcc420..5871fc75f 100644
--- a/test/confs/0130
+++ b/test/confs/0130
@@ -1,6 +1,7 @@
 # Exim test configuration 0130
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0131 b/test/confs/0131
index 85aa1250d..4ca5af5f4 100644
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -1,6 +1,7 @@
 # Exim test configuration 0131
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0132 b/test/confs/0132
index b018f2d6c..50bce7969 100644
--- a/test/confs/0132
+++ b/test/confs/0132
@@ -1,6 +1,7 @@
 # Exim test configuration 0132
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0133 b/test/confs/0133
index c85cc8dc3..7150db724 100644
--- a/test/confs/0133
+++ b/test/confs/0133
@@ -1,6 +1,7 @@
 # Exim test configuration 0133
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0134 b/test/confs/0134
index 8217278c4..c8f8227b0 100644
--- a/test/confs/0134
+++ b/test/confs/0134
@@ -1,6 +1,7 @@
 # Exim test configuration 0134
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0135 b/test/confs/0135
index 549579f5b..913373d8a 100644
--- a/test/confs/0135
+++ b/test/confs/0135
@@ -1,6 +1,7 @@
 # Exim test configuration 0135
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0136 b/test/confs/0136
index b35b4e078..c6bd5f557 100644
--- a/test/confs/0136
+++ b/test/confs/0136
@@ -3,6 +3,7 @@
 BRB=true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0137 b/test/confs/0137
index 82714a382..b40c83c15 100644
--- a/test/confs/0137
+++ b/test/confs/0137
@@ -1,6 +1,7 @@
 # Exim test configuration 0137
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0138 b/test/confs/0138
index a59fc8d46..9de30ce7d 100644
--- a/test/confs/0138
+++ b/test/confs/0138
@@ -1,6 +1,7 @@
 # Exim test configuration 0138
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0139 b/test/confs/0139
index a5a315e0a..b1a243e42 100644
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -1,6 +1,7 @@
 # Exim test configuration 0139
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0140 b/test/confs/0140
index d44f11a04..8ab406add 100644
--- a/test/confs/0140
+++ b/test/confs/0140
@@ -1,6 +1,7 @@
 # Exim test configuration 0140
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0141 b/test/confs/0141
index a9d2d2f68..ddb05cd66 100644
--- a/test/confs/0141
+++ b/test/confs/0141
@@ -1,6 +1,7 @@
 # Exim test configuration 0141
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0142 b/test/confs/0142
index 86d911101..2e25d4438 100644
--- a/test/confs/0142
+++ b/test/confs/0142
@@ -1,6 +1,7 @@
 # Exim test configuration 0142
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0143 b/test/confs/0143
index fd3bb295d..a6dfbb61f 100644
--- a/test/confs/0143
+++ b/test/confs/0143
@@ -1,6 +1,7 @@
 # Exim test configuration 0143
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0144 b/test/confs/0144
index d337a8e1e..3c5c4d035 100644
--- a/test/confs/0144
+++ b/test/confs/0144
@@ -1,6 +1,7 @@
 # Exim test configuration 0144
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0145 b/test/confs/0145
index ab8cc6691..f4f96590d 100644
--- a/test/confs/0145
+++ b/test/confs/0145
@@ -1,6 +1,7 @@
 # Exim test configuration 0145
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0146 b/test/confs/0146
index f2f0e26a3..a0f8a4c40 100644
--- a/test/confs/0146
+++ b/test/confs/0146
@@ -1,6 +1,7 @@
 # Exim test configuration 0146
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0147 b/test/confs/0147
index 643e86d44..bf78500f4 100644
--- a/test/confs/0147
+++ b/test/confs/0147
@@ -7,6 +7,7 @@ ABCD_XYZ = abcdxyz
 ABCD=abcd + ABCD_XYZ
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0148 b/test/confs/0148
index 6a87274d4..a01bbf26a 100644
--- a/test/confs/0148
+++ b/test/confs/0148
@@ -1,6 +1,7 @@
 # Exim test configuration 0148
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0149 b/test/confs/0149
index 33c022f22..30c35b400 100644
--- a/test/confs/0149
+++ b/test/confs/0149
@@ -1,6 +1,7 @@
 # Exim test configuration 0149
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/0150 b/test/confs/0150
index fa4bac12e..818f1a28b 100644
--- a/test/confs/0150
+++ b/test/confs/0150
@@ -1,6 +1,7 @@
 # Exim test configuration 0150
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0151 b/test/confs/0151
index 58aa30eed..5c8565e2e 100644
--- a/test/confs/0151
+++ b/test/confs/0151
@@ -1,6 +1,7 @@
 # Exim test configuration 0151
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0152 b/test/confs/0152
index 2804f6616..f8ca25104 100644
--- a/test/confs/0152
+++ b/test/confs/0152
@@ -1,6 +1,7 @@
 # Exim test configuration 0152
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0153 b/test/confs/0153
index c7fc79d54..171d6f5ac 100644
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -1,6 +1,7 @@
 # Exim test configuration 0153
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0154 b/test/confs/0154
index 84ed47d7d..3e9006eaa 100644
--- a/test/confs/0154
+++ b/test/confs/0154
@@ -1,6 +1,7 @@
 # Exim test configuration 0154
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0155 b/test/confs/0155
index b51837c4d..3fe4bb3c6 100644
--- a/test/confs/0155
+++ b/test/confs/0155
@@ -1,6 +1,7 @@
 # Exim test configuration 0155
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0156 b/test/confs/0156
index 389811416..e718552d6 100644
--- a/test/confs/0156
+++ b/test/confs/0156
@@ -1,6 +1,7 @@
 # Exim test configuration 0156
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0157 b/test/confs/0157
index 69556016e..674ed171e 100644
--- a/test/confs/0157
+++ b/test/confs/0157
@@ -1,6 +1,7 @@
 # Exim test configuration 0157
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0158 b/test/confs/0158
index 5af747138..e9001bc27 100644
--- a/test/confs/0158
+++ b/test/confs/0158
@@ -1,6 +1,7 @@
 # Exim test configuration 0158
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0159 b/test/confs/0159
index 59d3087c9..d5eb44a7b 100644
--- a/test/confs/0159
+++ b/test/confs/0159
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0160 b/test/confs/0160
index 68a5fe77a..f1ab669d0 100644
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -1,6 +1,7 @@
 # Exim test configuration 0160
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0161 b/test/confs/0161
index 46175d9a0..3a5626ad9 100644
--- a/test/confs/0161
+++ b/test/confs/0161
@@ -1,6 +1,7 @@
 # Exim test configuration 0161
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0162 b/test/confs/0162
index b8bc6ae55..d62d8a1c9 100644
--- a/test/confs/0162
+++ b/test/confs/0162
@@ -1,6 +1,7 @@
 # Exim test configuration 0162
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0163 b/test/confs/0163
index 4b217eef6..923968659 100644
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -1,6 +1,7 @@
 # Exim test configuration 0163
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0164 b/test/confs/0164
index 1d28066b4..c81cc617e 100644
--- a/test/confs/0164
+++ b/test/confs/0164
@@ -1,6 +1,7 @@
 # Exim test configuration 0164
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0165 b/test/confs/0165
index 03be27c40..dd9ec9ff1 100644
--- a/test/confs/0165
+++ b/test/confs/0165
@@ -1,6 +1,7 @@
 # Exim test configuration 0165
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0166 b/test/confs/0166
index 6d492d7fd..85a75fe9e 100644
--- a/test/confs/0166
+++ b/test/confs/0166
@@ -1,6 +1,7 @@
 # Exim test configuration 0166
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0167 b/test/confs/0167
index 633993424..06b857efc 100644
--- a/test/confs/0167
+++ b/test/confs/0167
@@ -1,6 +1,7 @@
 # Exim test configuration 0167
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0168 b/test/confs/0168
index ea10f1244..a16aa9813 100644
--- a/test/confs/0168
+++ b/test/confs/0168
@@ -1,6 +1,7 @@
 # Exim test configuration 0168
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0169 b/test/confs/0169
index 4a42f0de2..db212a2e5 100644
--- a/test/confs/0169
+++ b/test/confs/0169
@@ -1,6 +1,7 @@
 # Exim test configuration 0169
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0170 b/test/confs/0170
index 735b7b262..227acdbf2 100644
--- a/test/confs/0170
+++ b/test/confs/0170
@@ -1,6 +1,7 @@
 # Exim test configuration 0170
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0171 b/test/confs/0171
index 2c2d18e41..37f4b5c91 100644
--- a/test/confs/0171
+++ b/test/confs/0171
@@ -1,6 +1,7 @@
 # Exim test configuration 0171
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0172 b/test/confs/0172
index 82d1feac8..96567f25e 100644
--- a/test/confs/0172
+++ b/test/confs/0172
@@ -1,6 +1,7 @@
 # Exim test configuration 0172
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0173 b/test/confs/0173
index 6f8ded7cb..7fd9179dd 100644
--- a/test/confs/0173
+++ b/test/confs/0173
@@ -1,6 +1,7 @@
 # Exim test configuration 0173
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0174 b/test/confs/0174
index a3e11143e..ece486e34 100644
--- a/test/confs/0174
+++ b/test/confs/0174
@@ -1,6 +1,7 @@
 # Exim test configuration 0174
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0175 b/test/confs/0175
index 2898683e5..838a0736d 100644
--- a/test/confs/0175
+++ b/test/confs/0175
@@ -1,6 +1,7 @@
 # Exim test configuration 0175
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0176 b/test/confs/0176
index cf5d41f15..2b76446f4 100644
--- a/test/confs/0176
+++ b/test/confs/0176
@@ -1,6 +1,7 @@
 # Exim test configuration 0176
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0177 b/test/confs/0177
index ccf9611f9..3bc3ab024 100644
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -1,6 +1,7 @@
 # Exim test configuration 0177
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0178 b/test/confs/0178
index aaa83f0eb..e93137930 100644
--- a/test/confs/0178
+++ b/test/confs/0178
@@ -1,6 +1,7 @@
 # Exim test configuration 0178
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0179 b/test/confs/0179
index d3a6da6fd..14539bec4 100644
--- a/test/confs/0179
+++ b/test/confs/0179
@@ -1,6 +1,7 @@
 # Exim test configuration 0179
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0180 b/test/confs/0180
index 663780b90..29014f7e9 100644
--- a/test/confs/0180
+++ b/test/confs/0180
@@ -3,6 +3,7 @@
 CSS=check_spool_space=100000000K
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0181 b/test/confs/0181
index ab3bfdb2f..5e1624a32 100644
--- a/test/confs/0181
+++ b/test/confs/0181
@@ -1,6 +1,7 @@
 # Exim test configuration 0181
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0182 b/test/confs/0182
index f76ae7f67..ed75a6ca8 100644
--- a/test/confs/0182
+++ b/test/confs/0182
@@ -1,6 +1,7 @@
 # Exim test configuration 0182
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0183 b/test/confs/0183
index 65643d477..6ca0ed027 100644
--- a/test/confs/0183
+++ b/test/confs/0183
@@ -1,6 +1,7 @@
 # Exim test configuration 0183
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0184 b/test/confs/0184
index 9e43a38fd..95aaa14f2 100644
--- a/test/confs/0184
+++ b/test/confs/0184
@@ -1,6 +1,7 @@
 # Exim test configuration 0184
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0185 b/test/confs/0185
index d88d1e2f9..b17f72a97 100644
--- a/test/confs/0185
+++ b/test/confs/0185
@@ -1,6 +1,7 @@
 # Exim test configuration 0185
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0186 b/test/confs/0186
index 5aa2c70d5..8e88ab109 100644
--- a/test/confs/0186
+++ b/test/confs/0186
@@ -1,6 +1,7 @@
 # Exim test configuration 0186
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0187 b/test/confs/0187
index af570f0e0..6731b6230 100644
--- a/test/confs/0187
+++ b/test/confs/0187
@@ -1,6 +1,7 @@
 # Exim test configuration 0187
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0188 b/test/confs/0188
index 70eabdd51..2385462ef 100644
--- a/test/confs/0188
+++ b/test/confs/0188
@@ -1,6 +1,7 @@
 # Exim test configuration 0188
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0189 b/test/confs/0189
index bc29d4961..28831d622 100644
--- a/test/confs/0189
+++ b/test/confs/0189
@@ -1,6 +1,7 @@
 # Exim test configuration 0189
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0190 b/test/confs/0190
index e76cdbbd1..fb4fdc90c 100644
--- a/test/confs/0190
+++ b/test/confs/0190
@@ -1,6 +1,7 @@
 # Exim test configuration 0190
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0191 b/test/confs/0191
index 4585e390a..04597e5ae 100644
--- a/test/confs/0191
+++ b/test/confs/0191
@@ -1,6 +1,7 @@
 # Exim test configuration 0191
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0192 b/test/confs/0192
index 42fb603ca..da0a6ffa7 100644
--- a/test/confs/0192
+++ b/test/confs/0192
@@ -1,6 +1,7 @@
 # Exim test configuration 0192
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0193 b/test/confs/0193
index 1cba850e7..dbc7ef62f 100644
--- a/test/confs/0193
+++ b/test/confs/0193
@@ -1,6 +1,7 @@
 # Exim test configuration 0193
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0194 b/test/confs/0194
index e2c4160ea..548a91545 100644
--- a/test/confs/0194
+++ b/test/confs/0194
@@ -1,6 +1,7 @@
 # Exim test configuration 0194
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0195 b/test/confs/0195
index 75c19ca62..4b479e601 100644
--- a/test/confs/0195
+++ b/test/confs/0195
@@ -1,6 +1,7 @@
 # Exim test configuration 0195
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0196 b/test/confs/0196
index 096aa30ab..73a71142f 100644
--- a/test/confs/0196
+++ b/test/confs/0196
@@ -1,6 +1,7 @@
 # Exim test configuration 0196
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0197 b/test/confs/0197
index 32760b5a1..0ed172695 100644
--- a/test/confs/0197
+++ b/test/confs/0197
@@ -4,6 +4,7 @@
 # and these settings.
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0198 b/test/confs/0198
index 3946f8441..4cdb86a2e 100644
--- a/test/confs/0198
+++ b/test/confs/0198
@@ -1,6 +1,7 @@
 # Exim test configuration 0198
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0199 b/test/confs/0199
index e7e17716f..17437ef63 100644
--- a/test/confs/0199
+++ b/test/confs/0199
@@ -1,6 +1,7 @@
 # Exim test configuration 0199
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0200 b/test/confs/0200
index 0660b9a2e..1c6e9f675 100644
--- a/test/confs/0200
+++ b/test/confs/0200
@@ -1,6 +1,7 @@
 # Exim test configuration 0200
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0201 b/test/confs/0201
index 0c1a0510a..1575bcd9c 100644
--- a/test/confs/0201
+++ b/test/confs/0201
@@ -1,6 +1,7 @@
 # Exim test configuration 0201
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0202 b/test/confs/0202
index 56f601416..f7a51edd4 100644
--- a/test/confs/0202
+++ b/test/confs/0202
@@ -1,6 +1,7 @@
 # Exim test configuration 0202
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0203 b/test/confs/0203
index 3e7f49652..2dc3d2790 100644
--- a/test/confs/0203
+++ b/test/confs/0203
@@ -1,6 +1,7 @@
 # Exim test configuration 0203
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0204 b/test/confs/0204
index fa0400a91..e5792de54 100644
--- a/test/confs/0204
+++ b/test/confs/0204
@@ -1,6 +1,7 @@
 # Exim test configuration 0204
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0205 b/test/confs/0205
index 4dc1be78a..60c943e2c 100644
--- a/test/confs/0205
+++ b/test/confs/0205
@@ -1,6 +1,7 @@
 # Exim test configuration 0205
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0206 b/test/confs/0206
index 80fc0d851..f6fc540e2 100644
--- a/test/confs/0206
+++ b/test/confs/0206
@@ -1,6 +1,7 @@
 # Exim test configuration 0206
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0207 b/test/confs/0207
index 1bc90fe41..9a7d5bfa9 100644
--- a/test/confs/0207
+++ b/test/confs/0207
@@ -1,6 +1,7 @@
 # Exim test configuration 0207
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0208 b/test/confs/0208
index 8a1a87dfe..8d74eabfc 100644
--- a/test/confs/0208
+++ b/test/confs/0208
@@ -3,6 +3,7 @@
 MESSAGE_LOGS = true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0209 b/test/confs/0209
index 28a3d6d77..e24138956 100644
--- a/test/confs/0209
+++ b/test/confs/0209
@@ -1,6 +1,7 @@
 # Exim test configuration 0209
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0210 b/test/confs/0210
index 28e29cd6d..33306388f 100644
--- a/test/confs/0210
+++ b/test/confs/0210
@@ -1,6 +1,7 @@
 # Exim test configuration 0210
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0211 b/test/confs/0211
index 6a532b6a0..5a86785dd 100644
--- a/test/confs/0211
+++ b/test/confs/0211
@@ -1,6 +1,7 @@
 # Exim test configuration 0211
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0212 b/test/confs/0212
index a4c623bd8..feea11533 100644
--- a/test/confs/0212
+++ b/test/confs/0212
@@ -1,6 +1,7 @@
 # Exim test configuration 0212
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0213 b/test/confs/0213
index e28136352..71c716faf 100644
--- a/test/confs/0213
+++ b/test/confs/0213
@@ -1,6 +1,7 @@
 # Exim test configuration 0213
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0214 b/test/confs/0214
index e06affae8..6ba026d02 100644
--- a/test/confs/0214
+++ b/test/confs/0214
@@ -1,6 +1,7 @@
 # Exim test configuration 0214
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0215 b/test/confs/0215
index 30277dac8..075b2b54c 100644
--- a/test/confs/0215
+++ b/test/confs/0215
@@ -5,6 +5,7 @@ AUTHS=
 AUTHF=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0216 b/test/confs/0216
index 777737c07..253e001e1 100644
--- a/test/confs/0216
+++ b/test/confs/0216
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0217 b/test/confs/0217
index a446c2896..44dce1345 100644
--- a/test/confs/0217
+++ b/test/confs/0217
@@ -3,6 +3,7 @@
 HAP=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0218 b/test/confs/0218
index 4a96d825e..fae18f0e1 100644
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -1,6 +1,7 @@
 # Exim test configuration 0218
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0219 b/test/confs/0219
index 9ae32da17..9a44a46b0 100644
--- a/test/confs/0219
+++ b/test/confs/0219
@@ -1,6 +1,7 @@
 # Exim test configuration 0219
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0220 b/test/confs/0220
index ef71838ac..0c21b5af6 100644
--- a/test/confs/0220
+++ b/test/confs/0220
@@ -1,6 +1,7 @@
 # Exim test configuration 0220
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0221 b/test/confs/0221
index 8cf29a197..f9584d18e 100644
--- a/test/confs/0221
+++ b/test/confs/0221
@@ -1,6 +1,7 @@
 # Exim test configuration 0221
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0222 b/test/confs/0222
index f2ed82213..00eddf642 100644
--- a/test/confs/0222
+++ b/test/confs/0222
@@ -1,6 +1,7 @@
 # Exim test configuration 0222
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0223 b/test/confs/0223
index 640b98cd1..7747a8716 100644
--- a/test/confs/0223
+++ b/test/confs/0223
@@ -1,6 +1,7 @@
 # Exim test configuration 0223
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0224 b/test/confs/0224
index 10b429e49..377bd5a23 100644
--- a/test/confs/0224
+++ b/test/confs/0224
@@ -1,6 +1,7 @@
 # Exim test configuration 0224
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0225 b/test/confs/0225
index 5a2cacef7..9d4e4abf2 100644
--- a/test/confs/0225
+++ b/test/confs/0225
@@ -1,6 +1,7 @@
 # Exim test configuration 0225
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0226 b/test/confs/0226
index b7117f257..5d56c6e9d 100644
--- a/test/confs/0226
+++ b/test/confs/0226
@@ -1,6 +1,7 @@
 # Exim test configuration 0226
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0227 b/test/confs/0227
index 8aaf7a881..7100f6a15 100644
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -1,6 +1,7 @@
 # Exim test configuration 0227
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0228 b/test/confs/0228
index 4253c38e0..3bbd157f2 100644
--- a/test/confs/0228
+++ b/test/confs/0228
@@ -1,6 +1,7 @@
 # Exim test configuration 0228
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0229 b/test/confs/0229
index 0a299bfda..b6ddcc192 100644
--- a/test/confs/0229
+++ b/test/confs/0229
@@ -1,6 +1,7 @@
 # Exim test configuration 0229
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0230 b/test/confs/0230
index c5fc9584c..7e0480b22 100644
--- a/test/confs/0230
+++ b/test/confs/0230
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0231 b/test/confs/0231
index c8dcbd2c9..7350256a9 100644
--- a/test/confs/0231
+++ b/test/confs/0231
@@ -1,6 +1,7 @@
 # Exim test configuration 0231
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0232 b/test/confs/0232
index 9c9f55851..03989bf02 100644
--- a/test/confs/0232
+++ b/test/confs/0232
@@ -1,6 +1,7 @@
 # Exim test configuration 0232
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0233 b/test/confs/0233
index 0fb615de7..95d0ef1aa 100644
--- a/test/confs/0233
+++ b/test/confs/0233
@@ -1,6 +1,7 @@
 # Exim test configuration 0233
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0234 b/test/confs/0234
index 65df41a31..b64904116 100644
--- a/test/confs/0234
+++ b/test/confs/0234
@@ -1,6 +1,7 @@
 # Exim test configuration 0234
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0235 b/test/confs/0235
index 42cd93491..186b6f1b7 100644
--- a/test/confs/0235
+++ b/test/confs/0235
@@ -1,6 +1,7 @@
 # Exim test configuration 0235
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0236 b/test/confs/0236
index 05a544f13..55146a134 100644
--- a/test/confs/0236
+++ b/test/confs/0236
@@ -1,6 +1,7 @@
 # Exim test configuration 0236
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0237 b/test/confs/0237
index a70f84f4d..5258593ac 100644
--- a/test/confs/0237
+++ b/test/confs/0237
@@ -1,6 +1,7 @@
 # Exim test configuration 0237
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0238 b/test/confs/0238
index b66c2160a..cc874bb09 100644
--- a/test/confs/0238
+++ b/test/confs/0238
@@ -1,6 +1,7 @@
 # Exim test configuration 0238
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0239 b/test/confs/0239
index 7d7194dcd..4507b53a0 100644
--- a/test/confs/0239
+++ b/test/confs/0239
@@ -1,6 +1,7 @@
 # Exim test configuration 0239
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0240 b/test/confs/0240
index beaf6c985..27756fced 100644
--- a/test/confs/0240
+++ b/test/confs/0240
@@ -1,6 +1,7 @@
 # Exim test configuration 0240
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
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..04acfd975 100644
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -1,6 +1,7 @@
 # Exim test configuration 0242
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0243 b/test/confs/0243
index 5f9811084..5692765ed 100644
--- a/test/confs/0243
+++ b/test/confs/0243
@@ -1,6 +1,7 @@
 # Exim test configuration 0243
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0244 b/test/confs/0244
index 6dd6b0cfe..d2a83365f 100644
--- a/test/confs/0244
+++ b/test/confs/0244
@@ -1,6 +1,7 @@
 # Exim test configuration 0244
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0245 b/test/confs/0245
index d2050c7a3..1e8662ee6 100644
--- a/test/confs/0245
+++ b/test/confs/0245
@@ -1,6 +1,7 @@
 # Exim test configuration 0245
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0246 b/test/confs/0246
index 9aad3e1a6..c73729cd0 100644
--- a/test/confs/0246
+++ b/test/confs/0246
@@ -1,6 +1,7 @@
 # Exim test configuration 0246
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0247 b/test/confs/0247
index bab6c9220..df324b523 100644
--- a/test/confs/0247
+++ b/test/confs/0247
@@ -1,6 +1,7 @@
 # Exim test configuration 0247
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0248 b/test/confs/0248
index c91d4602d..c0f7b529f 100644
--- a/test/confs/0248
+++ b/test/confs/0248
@@ -1,6 +1,7 @@
 # Exim test configuration 0248
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0249 b/test/confs/0249
index c9425d8d6..151c69422 100644
--- a/test/confs/0249
+++ b/test/confs/0249
@@ -1,6 +1,7 @@
 # Exim test configuration 0249
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0250 b/test/confs/0250
index da0fb2e5d..b6d8d001d 100644
--- a/test/confs/0250
+++ b/test/confs/0250
@@ -1,6 +1,7 @@
 # Exim test configuration 0250
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0251 b/test/confs/0251
index a6945ccca..aa9d4ec0d 100644
--- a/test/confs/0251
+++ b/test/confs/0251
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0252 b/test/confs/0252
index c5d6fb6aa..78f894eea 100644
--- a/test/confs/0252
+++ b/test/confs/0252
@@ -1,6 +1,7 @@
 # Exim test configuration 0252
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0253 b/test/confs/0253
index 00a4b60d8..ae62fda81 100644
--- a/test/confs/0253
+++ b/test/confs/0253
@@ -1,6 +1,7 @@
 # Exim test configuration 0253
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0254 b/test/confs/0254
index f072c649e..06c7b797d 100644
--- a/test/confs/0254
+++ b/test/confs/0254
@@ -1,6 +1,7 @@
 # Exim test configuration 0254
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0255 b/test/confs/0255
index 341f704d4..0a6788b72 100644
--- a/test/confs/0255
+++ b/test/confs/0255
@@ -3,6 +3,7 @@
 OPTION=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0256 b/test/confs/0256
index 2e02fef4b..40f69062c 100644
--- a/test/confs/0256
+++ b/test/confs/0256
@@ -1,6 +1,7 @@
 # Exim test configuration 0256
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0257 b/test/confs/0257
index f2403a368..e15c34a13 100644
--- a/test/confs/0257
+++ b/test/confs/0257
@@ -1,6 +1,7 @@
 # Exim test configuration 0257
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0258 b/test/confs/0258
index de433734b..a3f80baae 100644
--- a/test/confs/0258
+++ b/test/confs/0258
@@ -1,6 +1,7 @@
 # Exim test configuration 0258
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0259 b/test/confs/0259
index e5a42dd4a..7940945ab 100644
--- a/test/confs/0259
+++ b/test/confs/0259
@@ -1,6 +1,7 @@
 # Exim test configuration 0259
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 5s
diff --git a/test/confs/0260 b/test/confs/0260
index 442ab2880..b0c549d46 100644
--- a/test/confs/0260
+++ b/test/confs/0260
@@ -1,6 +1,7 @@
 # Exim test configuration 0260
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0261 b/test/confs/0261
index e39db4670..b377ae779 100644
--- a/test/confs/0261
+++ b/test/confs/0261
@@ -1,6 +1,7 @@
 # Exim test configuration 0261
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0262 b/test/confs/0262
index 92e65f428..0f4b905bb 100644
--- a/test/confs/0262
+++ b/test/confs/0262
@@ -1,6 +1,7 @@
 # Exim test configuration 0262
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0263 b/test/confs/0263
index ac5599967..80ce677bb 100644
--- a/test/confs/0263
+++ b/test/confs/0263
@@ -1,6 +1,7 @@
 # Exim test configuration 0263
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0264 b/test/confs/0264
index 3d9505e88..aef8d8747 100644
--- a/test/confs/0264
+++ b/test/confs/0264
@@ -1,6 +1,7 @@
 # Exim test configuration 0264
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0265 b/test/confs/0265
index 586805b78..a94ab67ef 100644
--- a/test/confs/0265
+++ b/test/confs/0265
@@ -1,6 +1,7 @@
 # Exim test configuration 0265
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0266 b/test/confs/0266
index 9fe2dfe26..dd4b431e3 100644
--- a/test/confs/0266
+++ b/test/confs/0266
@@ -1,6 +1,7 @@
 # Exim test configuration 0266
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0267 b/test/confs/0267
index 1e335bee3..114de9421 100644
--- a/test/confs/0267
+++ b/test/confs/0267
@@ -1,6 +1,7 @@
 # Exim test configuration 0267
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0268 b/test/confs/0268
index 858397a25..4ea429f7f 100644
--- a/test/confs/0268
+++ b/test/confs/0268
@@ -1,6 +1,7 @@
 # Exim test configuration 0268
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0269 b/test/confs/0269
index ce735dbe5..57733812e 100644
--- a/test/confs/0269
+++ b/test/confs/0269
@@ -1,6 +1,7 @@
 # Exim test configuration 0269
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0270 b/test/confs/0270
index 117579e84..772f456be 100644
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -1,6 +1,7 @@
 # Exim test configuration 0270
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0271 b/test/confs/0271
index 47aa77b8d..f3df54738 100644
--- a/test/confs/0271
+++ b/test/confs/0271
@@ -1,6 +1,7 @@
 # Exim test configuration 0271
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0272 b/test/confs/0272
index 42ae1a614..aaedd38d5 100644
--- a/test/confs/0272
+++ b/test/confs/0272
@@ -1,6 +1,7 @@
 # Exim test configuration 0272
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0273 b/test/confs/0273
index b60b66271..557dd51b2 100644
--- a/test/confs/0273
+++ b/test/confs/0273
@@ -1,6 +1,7 @@
 # Exim test configuration 0273
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0274 b/test/confs/0274
index cd76881c4..ab98f68dd 100644
--- a/test/confs/0274
+++ b/test/confs/0274
@@ -1,6 +1,7 @@
 # Exim test configuration 0274
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0275 b/test/confs/0275
index 2e62a907c..af5da63f2 100644
--- a/test/confs/0275
+++ b/test/confs/0275
@@ -1,6 +1,7 @@
 # Exim test configuration 0275
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0276 b/test/confs/0276
index db4afafdc..9aab39bde 100644
--- a/test/confs/0276
+++ b/test/confs/0276
@@ -1,6 +1,7 @@
 # Exim test configuration 0276
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0277 b/test/confs/0277
index eeb79e6c7..74c93a085 100644
--- a/test/confs/0277
+++ b/test/confs/0277
@@ -1,6 +1,7 @@
 # Exim test configuration 0277
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0278 b/test/confs/0278
index 255ecef34..0809141e2 100644
--- a/test/confs/0278
+++ b/test/confs/0278
@@ -1,6 +1,7 @@
 # Exim test configuration 0278
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0279 b/test/confs/0279
index d8ec85dc2..f6d990d96 100644
--- a/test/confs/0279
+++ b/test/confs/0279
@@ -1,6 +1,7 @@
 # Exim test configuration 0279
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0280 b/test/confs/0280
index 3552582b0..004144a8f 100644
--- a/test/confs/0280
+++ b/test/confs/0280
@@ -1,6 +1,7 @@
 # Exim test configuration 0280
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0281 b/test/confs/0281
index 19e2e5527..ad18629d3 100644
--- a/test/confs/0281
+++ b/test/confs/0281
@@ -1,6 +1,7 @@
 # Exim test configuration 0281
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0282 b/test/confs/0282
index a77ac9ab5..31c673455 100644
--- a/test/confs/0282
+++ b/test/confs/0282
@@ -1,6 +1,7 @@
 # Exim test configuration 0282
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0283 b/test/confs/0283
index 93107d6db..6d91a6f9c 100644
--- a/test/confs/0283
+++ b/test/confs/0283
@@ -1,6 +1,7 @@
 # Exim test configuration 0283
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0284 b/test/confs/0284
index 5ba209af5..a3bac7b5b 100644
--- a/test/confs/0284
+++ b/test/confs/0284
@@ -1,6 +1,7 @@
 # Exim test configuration 0284
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0285 b/test/confs/0285
index 65095f0c0..dad843af1 100644
--- a/test/confs/0285
+++ b/test/confs/0285
@@ -1,6 +1,7 @@
 # Exim test configuration 0285
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0286 b/test/confs/0286
index b720a80c2..b05cf02a5 100644
--- a/test/confs/0286
+++ b/test/confs/0286
@@ -1,6 +1,7 @@
 # Exim test configuration 0286
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0287 b/test/confs/0287
index 08a87a3f4..fbb674a35 100644
--- a/test/confs/0287
+++ b/test/confs/0287
@@ -1,6 +1,7 @@
 # Exim test configuration 0287
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0288 b/test/confs/0288
index 0e9136bf3..17d4ee58f 100644
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -2,6 +2,7 @@
 # serialize_hosts option on smtp transport
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0289 b/test/confs/0289
index 66734518a..0c4b1f28d 100644
--- a/test/confs/0289
+++ b/test/confs/0289
@@ -1,6 +1,7 @@
 # Exim test configuration 0289
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0290 b/test/confs/0290
index 57e328216..5c4a7aa18 100644
--- a/test/confs/0290
+++ b/test/confs/0290
@@ -11,6 +11,7 @@ C2=#
 C1C2 this should be a comment
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0291 b/test/confs/0291
index 8eb6af279..d9bc47e63 100644
--- a/test/confs/0291
+++ b/test/confs/0291
@@ -1,6 +1,7 @@
 # Exim test configuration 0291
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0292 b/test/confs/0292
index a388ebd3a..3fdbeb299 100644
--- a/test/confs/0292
+++ b/test/confs/0292
@@ -1,6 +1,7 @@
 # Exim test configuration 0292
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0293 b/test/confs/0293
index 84f79b88a..4a57eb37f 100644
--- a/test/confs/0293
+++ b/test/confs/0293
@@ -1,6 +1,7 @@
 # Exim test configuration 0293
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0294 b/test/confs/0294
index 6b8a6112e..fffb9ed3f 100644
--- a/test/confs/0294
+++ b/test/confs/0294
@@ -1,6 +1,7 @@
 # Exim test configuration 0294
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0295 b/test/confs/0295
index ea16f79d7..04e5b36a8 100644
--- a/test/confs/0295
+++ b/test/confs/0295
@@ -1,6 +1,7 @@
 # Exim test configuration 0295
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0296 b/test/confs/0296
index fe7531502..9af875015 100644
--- a/test/confs/0296
+++ b/test/confs/0296
@@ -1,6 +1,7 @@
 # Exim test configuration 0296
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0297 b/test/confs/0297
index 8e692b690..fe5616a40 100644
--- a/test/confs/0297
+++ b/test/confs/0297
@@ -1,6 +1,7 @@
 # Exim test configuration 0297
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0298 b/test/confs/0298
index 47228e6af..a6cc98495 100644
--- a/test/confs/0298
+++ b/test/confs/0298
@@ -1,6 +1,7 @@
 # Exim test configuration 0298
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0299 b/test/confs/0299
index 619132bc7..fa351a774 100644
--- a/test/confs/0299
+++ b/test/confs/0299
@@ -1,6 +1,7 @@
 # Exim test configuration 0299
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0300 b/test/confs/0300
index cf47c2b79..ce36a0366 100644
--- a/test/confs/0300
+++ b/test/confs/0300
@@ -4,6 +4,7 @@ DELAY=0s
 PAH=127.0.0.1
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0301 b/test/confs/0301
index 493f5a0dd..4e1aab68e 100644
--- a/test/confs/0301
+++ b/test/confs/0301
@@ -1,6 +1,7 @@
 # Exim test configuration 0301
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0302 b/test/confs/0302
index 41c7af7fe..275f6f00c 100644
--- a/test/confs/0302
+++ b/test/confs/0302
@@ -1,6 +1,7 @@
 # Exim test configuration 0302
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0303 b/test/confs/0303
index 7670b60b6..d2613324e 100644
--- a/test/confs/0303
+++ b/test/confs/0303
@@ -1,6 +1,7 @@
 # Exim test configuration 0303
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0304 b/test/confs/0304
index 7f1e658bd..5bbada409 100644
--- a/test/confs/0304
+++ b/test/confs/0304
@@ -1,6 +1,7 @@
 # Exim test configuration 0304
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0305 b/test/confs/0305
index ceb51a82a..14366f6b5 100644
--- a/test/confs/0305
+++ b/test/confs/0305
@@ -1,6 +1,7 @@
 # Exim test configuration 0305
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0306 b/test/confs/0306
index 2526d9df1..6e14b31dd 100644
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -1,6 +1,7 @@
 # Exim test configuration 0306
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0307 b/test/confs/0307
index 5e664452b..db499851a 100644
--- a/test/confs/0307
+++ b/test/confs/0307
@@ -1,6 +1,7 @@
 # Exim test configuration 0307
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0308 b/test/confs/0308
index cf90b6e23..68a433e66 100644
--- a/test/confs/0308
+++ b/test/confs/0308
@@ -1,6 +1,7 @@
 # Exim test configuration 0308
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0309 b/test/confs/0309
index 2f7ccf0c3..05f6893ae 100644
--- a/test/confs/0309
+++ b/test/confs/0309
@@ -1,6 +1,7 @@
 # Exim test configuration 0309
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0310 b/test/confs/0310
index 45eab9213..44953ba85 100644
--- a/test/confs/0310
+++ b/test/confs/0310
@@ -1,6 +1,7 @@
 # Exim test configuration 0310
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0311 b/test/confs/0311
index 5f7a791dd..f26236f5a 100644
--- a/test/confs/0311
+++ b/test/confs/0311
@@ -1,6 +1,7 @@
 # Exim test configuration 0311
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0312 b/test/confs/0312
index 78a56c03e..590131b00 100644
--- a/test/confs/0312
+++ b/test/confs/0312
@@ -1,6 +1,7 @@
 # Exim test configuration 0312
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0313 b/test/confs/0313
index 64e061215..5ff28b230 100644
--- a/test/confs/0313
+++ b/test/confs/0313
@@ -1,6 +1,7 @@
 # Exim test configuration 0313
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0314 b/test/confs/0314
index d9a066075..f52695892 100644
--- a/test/confs/0314
+++ b/test/confs/0314
@@ -1,6 +1,7 @@
 # Exim test configuration 0314
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0315 b/test/confs/0315
index afa292ddc..7566ca2b6 100644
--- a/test/confs/0315
+++ b/test/confs/0315
@@ -1,6 +1,7 @@
 # Exim test configuration 0315
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0316 b/test/confs/0316
index 1a6238b8c..b26273c59 100644
--- a/test/confs/0316
+++ b/test/confs/0316
@@ -1,6 +1,7 @@
 # Exim test configuration 0316
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0317 b/test/confs/0317
index 2c3e66198..cafcfe9cf 100644
--- a/test/confs/0317
+++ b/test/confs/0317
@@ -1,6 +1,7 @@
 # Exim test configuration 0317
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0318 b/test/confs/0318
index e57fe8eee..fcb3c454c 100644
--- a/test/confs/0318
+++ b/test/confs/0318
@@ -1,6 +1,7 @@
 # Exim test configuration 0318
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0319 b/test/confs/0319
index 8a279a521..68cff3f89 100644
--- a/test/confs/0319
+++ b/test/confs/0319
@@ -1,6 +1,7 @@
 # Exim test configuration 0319
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0320 b/test/confs/0320
index e9191ee35..cdde86c85 100644
--- a/test/confs/0320
+++ b/test/confs/0320
@@ -1,6 +1,7 @@
 # Exim test configuration 0320
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0321 b/test/confs/0321
index 6ea0bcfe9..b32615a6b 100644
--- a/test/confs/0321
+++ b/test/confs/0321
@@ -1,6 +1,7 @@
 # Exim test configuration 0321
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0322 b/test/confs/0322
index 2901010ad..94864147a 100644
--- a/test/confs/0322
+++ b/test/confs/0322
@@ -3,6 +3,7 @@
 LS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0323 b/test/confs/0323
index 253f8372c..3eebcb2e3 100644
--- a/test/confs/0323
+++ b/test/confs/0323
@@ -1,6 +1,7 @@
 # Exim test configuration 0323
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0324 b/test/confs/0324
index e1353ccc1..1c946102a 100644
--- a/test/confs/0324
+++ b/test/confs/0324
@@ -1,6 +1,7 @@
 # Exim test configuration 0324
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0325 b/test/confs/0325
index 4d145d851..2a5bf6377 100644
--- a/test/confs/0325
+++ b/test/confs/0325
@@ -1,6 +1,7 @@
 # Exim test configuration 0325
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0326 b/test/confs/0326
index 5081f88a2..fb9b5c945 100644
--- a/test/confs/0326
+++ b/test/confs/0326
@@ -1,6 +1,7 @@
 # Exim test configuration 0326
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0327 b/test/confs/0327
index 28922ed73..f3216575c 100644
--- a/test/confs/0327
+++ b/test/confs/0327
@@ -1,6 +1,7 @@
 # Exim test configuration 0327
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0328 b/test/confs/0328
index 48d29a4a3..f14d1c7b6 100644
--- a/test/confs/0328
+++ b/test/confs/0328
@@ -1,6 +1,7 @@
 # Exim test configuration 0328
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0329 b/test/confs/0329
index 1d853fa91..9529207b2 100644
--- a/test/confs/0329
+++ b/test/confs/0329
@@ -1,6 +1,7 @@
 # Exim test configuration 0329
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0330 b/test/confs/0330
index 9d53d7a79..b4a7a164a 100644
--- a/test/confs/0330
+++ b/test/confs/0330
@@ -1,6 +1,7 @@
 # Exim test configuration 0330
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0331 b/test/confs/0331
index 934030529..8c62e2298 100644
--- a/test/confs/0331
+++ b/test/confs/0331
@@ -1,6 +1,7 @@
 # Exim test configuration 0331
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0332 b/test/confs/0332
index bf16c2ea7..5bf3a093b 100644
--- a/test/confs/0332
+++ b/test/confs/0332
@@ -1,6 +1,7 @@
 # Exim test configuration 0332
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0333 b/test/confs/0333
index 388987333..ed9e665db 100644
--- a/test/confs/0333
+++ b/test/confs/0333
@@ -1,6 +1,7 @@
 # Exim test configuration 0333
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0334 b/test/confs/0334
index a04081e52..48951f992 100644
--- a/test/confs/0334
+++ b/test/confs/0334
@@ -1,6 +1,7 @@
 # Exim test configuration 0334
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0335 b/test/confs/0335
index e78f4ebe1..7f236cf36 100644
--- a/test/confs/0335
+++ b/test/confs/0335
@@ -1,6 +1,7 @@
 # Exim test configuration 0335
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0336 b/test/confs/0336
index d85ab8489..b52635959 100644
--- a/test/confs/0336
+++ b/test/confs/0336
@@ -1,6 +1,7 @@
 # Exim test configuration 0336
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0337 b/test/confs/0337
index 026d4f724..3fe87dbda 100644
--- a/test/confs/0337
+++ b/test/confs/0337
@@ -1,6 +1,7 @@
 # Exim test configuration 0337
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0338 b/test/confs/0338
index 1ea147be3..a721b55b9 100644
--- a/test/confs/0338
+++ b/test/confs/0338
@@ -1,6 +1,7 @@
 # Exim test configuration 0338
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0339 b/test/confs/0339
index 8048352fd..1f877ec49 100644
--- a/test/confs/0339
+++ b/test/confs/0339
@@ -1,6 +1,7 @@
 # Exim test configuration 0339
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0340 b/test/confs/0340
index a824813ac..f9a083ff9 100644
--- a/test/confs/0340
+++ b/test/confs/0340
@@ -1,6 +1,7 @@
 # Exim test configuration 0340
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0341 b/test/confs/0341
index f873809e2..b8c0fb904 100644
--- a/test/confs/0341
+++ b/test/confs/0341
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0342 b/test/confs/0342
index b0053226a..cf1141761 100644
--- a/test/confs/0342
+++ b/test/confs/0342
@@ -1,6 +1,7 @@
 # Exim test configuration 0342
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0343 b/test/confs/0343
index 2dc7d6e49..52f90bc12 100644
--- a/test/confs/0343
+++ b/test/confs/0343
@@ -1,6 +1,7 @@
 # Exim test configuration 0343
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0344 b/test/confs/0344
index 591294deb..1f067ced2 100644
--- a/test/confs/0344
+++ b/test/confs/0344
@@ -1,6 +1,7 @@
 # Exim test configuration 0344
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0345 b/test/confs/0345
index d57ba1100..d6456345e 100644
--- a/test/confs/0345
+++ b/test/confs/0345
@@ -1,6 +1,7 @@
 # Exim test configuration 0345
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0346 b/test/confs/0346
index 9d648dcde..de9e4d076 100644
--- a/test/confs/0346
+++ b/test/confs/0346
@@ -1,6 +1,7 @@
 # Exim test configuration 0346
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0347 b/test/confs/0347
index 506524279..af2fef817 100644
--- a/test/confs/0347
+++ b/test/confs/0347
@@ -1,6 +1,7 @@
 # Exim test configuration 0347
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0348 b/test/confs/0348
index 651a94fe4..0adeb040a 100644
--- a/test/confs/0348
+++ b/test/confs/0348
@@ -3,6 +3,7 @@
 RETRY=G,1,20m,1.5
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0349 b/test/confs/0349
index ff3bd857e..411dcdcd9 100644
--- a/test/confs/0349
+++ b/test/confs/0349
@@ -1,6 +1,7 @@
 # Exim test configuration 0349
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0350 b/test/confs/0350
index a3d606946..cbdf68ecc 100644
--- a/test/confs/0350
+++ b/test/confs/0350
@@ -1,6 +1,7 @@
 # Exim test configuration 0350
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0351 b/test/confs/0351
index 0c306f5c0..7cfe1a2f5 100644
--- a/test/confs/0351
+++ b/test/confs/0351
@@ -1,6 +1,7 @@
 # Exim test configuration 0351
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0352 b/test/confs/0352
index e3e9555f3..8bf302e7e 100644
--- a/test/confs/0352
+++ b/test/confs/0352
@@ -1,6 +1,7 @@
 # Exim test configuration 0352
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0353 b/test/confs/0353
index 566cb284c..d3504c69d 100644
--- a/test/confs/0353
+++ b/test/confs/0353
@@ -1,6 +1,7 @@
 # Exim test configuration 0353
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0354 b/test/confs/0354
index b1b92692d..5446ae876 100644
--- a/test/confs/0354
+++ b/test/confs/0354
@@ -1,6 +1,7 @@
 # Exim test configuration 0354
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0355 b/test/confs/0355
index 7523892a9..73dc6b131 100644
--- a/test/confs/0355
+++ b/test/confs/0355
@@ -1,6 +1,7 @@
 # Exim test configuration 0355
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0356 b/test/confs/0356
index 12dc13ab8..e96eef8d1 100644
--- a/test/confs/0356
+++ b/test/confs/0356
@@ -3,6 +3,7 @@
 MESSAGE_LOGS =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0357 b/test/confs/0357
index 45ca7d320..6fd1bc65f 100644
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -1,6 +1,7 @@
 # Exim test configuration 0357
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0358 b/test/confs/0358
index d6665da51..8dd6a80b3 100644
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -1,6 +1,7 @@
 # Exim test configuration 0358
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0359 b/test/confs/0359
index 1975cf378..57fc1c227 100644
--- a/test/confs/0359
+++ b/test/confs/0359
@@ -1,6 +1,7 @@
 # Exim test configuration 0359
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0360 b/test/confs/0360
index b24010459..d5ecc9009 100644
--- a/test/confs/0360
+++ b/test/confs/0360
@@ -1,6 +1,7 @@
 # Exim test configuration 0360
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0361 b/test/confs/0361
index 275ae21a4..dfc29deb8 100644
--- a/test/confs/0361
+++ b/test/confs/0361
@@ -1,6 +1,7 @@
 # Exim test configuration 0361
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0362 b/test/confs/0362
index 15ea70fbe..17a252c59 100644
--- a/test/confs/0362
+++ b/test/confs/0362
@@ -1,6 +1,7 @@
 # Exim test configuration 0362
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0363 b/test/confs/0363
index bddeb243e..e5bf738ca 100644
--- a/test/confs/0363
+++ b/test/confs/0363
@@ -1,6 +1,7 @@
 # Exim test configuration 0363
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0364 b/test/confs/0364
index 706618d1b..4192bad16 100644
--- a/test/confs/0364
+++ b/test/confs/0364
@@ -1,6 +1,7 @@
 # Exim test configuration 0364
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0365 b/test/confs/0365
index dbe113d28..4cbc22d33 100644
--- a/test/confs/0365
+++ b/test/confs/0365
@@ -4,6 +4,7 @@ DETAILS=false
 SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0366 b/test/confs/0366
index ec639aee7..f681f75c9 100644
--- a/test/confs/0366
+++ b/test/confs/0366
@@ -3,6 +3,7 @@
 HOSTS_MAX_TRY=5
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0367 b/test/confs/0367
index bf743c883..10174692a 100644
--- a/test/confs/0367
+++ b/test/confs/0367
@@ -1,6 +1,7 @@
 # Exim test configuration 0367
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0368 b/test/confs/0368
index 08fffb406..466257414 100644
--- a/test/confs/0368
+++ b/test/confs/0368
@@ -1,6 +1,7 @@
 # Exim test configuration 0368
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0369 b/test/confs/0369
index 7829414f1..d062137db 100644
--- a/test/confs/0369
+++ b/test/confs/0369
@@ -1,6 +1,7 @@
 # Exim test configuration 0369
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0370 b/test/confs/0370
index 63aad00be..00f3f458b 100644
--- a/test/confs/0370
+++ b/test/confs/0370
@@ -1,6 +1,7 @@
 # Exim test configuration 0370
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0371 b/test/confs/0371
index 680377fcd..b2cf41dc6 100644
--- a/test/confs/0371
+++ b/test/confs/0371
@@ -1,6 +1,7 @@
 # Exim test configuration 0371
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0372 b/test/confs/0372
index 6e457e7f5..b08ac66c4 100644
--- a/test/confs/0372
+++ b/test/confs/0372
@@ -3,6 +3,7 @@
 STRICT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0373 b/test/confs/0373
index 9f672ced0..16f0d637e 100644
--- a/test/confs/0373
+++ b/test/confs/0373
@@ -1,6 +1,7 @@
 # Exim test configuration 0373
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0374 b/test/confs/0374
index 87b3e182d..4361bcc52 100644
--- a/test/confs/0374
+++ b/test/confs/0374
@@ -1,6 +1,7 @@
 # Exim test configuration 0374
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0375 b/test/confs/0375
index 229230209..3b622ae9f 100644
--- a/test/confs/0375
+++ b/test/confs/0375
@@ -1,6 +1,7 @@
 # Exim test configuration 0375
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0376 b/test/confs/0376
index de6feb6d1..04731c975 100644
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -3,6 +3,7 @@
 PEX=10s
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0377 b/test/confs/0377
index 362ec37f1..3d77e208d 100644
--- a/test/confs/0377
+++ b/test/confs/0377
@@ -1,6 +1,7 @@
 # Exim test configuration 0377
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0378 b/test/confs/0378
index 8046c87f8..5604eb325 100644
--- a/test/confs/0378
+++ b/test/confs/0378
@@ -1,6 +1,7 @@
 # Exim test configuration 0378
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0379 b/test/confs/0379
index 6dae00b93..6342780fc 100644
--- a/test/confs/0379
+++ b/test/confs/0379
@@ -1,6 +1,7 @@
 # Exim test configuration 0379
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0380 b/test/confs/0380
index 4b478d3d4..5264a7d83 100644
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -1,6 +1,7 @@
 # Exim test configuration 0380
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0381 b/test/confs/0381
index 02a84a85c..8eaa38fb0 100644
--- a/test/confs/0381
+++ b/test/confs/0381
@@ -1,6 +1,7 @@
 # Exim test configuration 0381
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0382 b/test/confs/0382
index 3dae69dd4..f9d36eebf 100644
--- a/test/confs/0382
+++ b/test/confs/0382
@@ -1,6 +1,7 @@
 # Exim test configuration 0382
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0383 b/test/confs/0383
index 51d8f8f37..034ccaea9 100644
--- a/test/confs/0383
+++ b/test/confs/0383
@@ -1,6 +1,7 @@
 # Exim test configuration 0383
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0384 b/test/confs/0384
index 0287358c0..5ce6fec05 100644
--- a/test/confs/0384
+++ b/test/confs/0384
@@ -1,6 +1,7 @@
 # Exim test configuration 0384
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0385 b/test/confs/0385
index 39689c556..baa5af040 100644
--- a/test/confs/0385
+++ b/test/confs/0385
@@ -1,6 +1,7 @@
 # Exim test configuration 0385
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0386 b/test/confs/0386
index b466066a3..7e8c487ae 100644
--- a/test/confs/0386
+++ b/test/confs/0386
@@ -1,6 +1,7 @@
 # Exim test configuration 0386
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0387 b/test/confs/0387
index 4193a139f..0833efd48 100644
--- a/test/confs/0387
+++ b/test/confs/0387
@@ -1,6 +1,7 @@
 # Exim test configuration 0387
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0388 b/test/confs/0388
index 38166b449..54651ad29 100644
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -1,6 +1,7 @@
 # Exim test configuration 0388
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0389 b/test/confs/0389
index fabc15179..f06cf19dd 100644
--- a/test/confs/0389
+++ b/test/confs/0389
@@ -1,6 +1,7 @@
 # Exim test configuration 0389
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0390 b/test/confs/0390
index 5b88cd7b2..5fb589255 100644
--- a/test/confs/0390
+++ b/test/confs/0390
@@ -1,6 +1,7 @@
 # Exim test configuration 0390
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0391 b/test/confs/0391
index a2ee5ef9d..4a2f41474 100644
--- a/test/confs/0391
+++ b/test/confs/0391
@@ -1,6 +1,7 @@
 # Exim test configuration 0391
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0392 b/test/confs/0392
index ae809d52f..9b062526b 100644
--- a/test/confs/0392
+++ b/test/confs/0392
@@ -1,6 +1,7 @@
 # Exim test configuration 0392
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0393 b/test/confs/0393
index d83857170..e75af0399 100644
--- a/test/confs/0393
+++ b/test/confs/0393
@@ -3,6 +3,7 @@
 FILTER=/bin/cat
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0394 b/test/confs/0394
index 7e6511964..9a71beef9 100644
--- a/test/confs/0394
+++ b/test/confs/0394
@@ -3,6 +3,7 @@
 OPT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0395 b/test/confs/0395
index 4e00be813..5962ad34a 100644
--- a/test/confs/0395
+++ b/test/confs/0395
@@ -3,6 +3,7 @@
 TRUSTED=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0396 b/test/confs/0396
index 2dac89ab9..3d06554d3 100644
--- a/test/confs/0396
+++ b/test/confs/0396
@@ -1,6 +1,7 @@
 # Exim test configuration 0396
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
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..3e3f5a589 100644
--- a/test/confs/0398
+++ b/test/confs/0398
@@ -1,6 +1,7 @@
 # Exim test configuration 0398
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0399 b/test/confs/0399
index 38da70b6c..ee9b4f6c7 100644
--- a/test/confs/0399
+++ b/test/confs/0399
@@ -1,6 +1,7 @@
 # Exim test configuration 0399
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0400 b/test/confs/0400
index 2c44a2b74..05ffaeb45 100644
--- a/test/confs/0400
+++ b/test/confs/0400
@@ -3,6 +3,7 @@
 DATA=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0401 b/test/confs/0401
index bd9a15c82..dbc77005f 100644
--- a/test/confs/0401
+++ b/test/confs/0401
@@ -1,6 +1,7 @@
 # Exim test configuration 0401
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0402 b/test/confs/0402
index 9e9ccf956..f83c45337 100644
--- a/test/confs/0402
+++ b/test/confs/0402
@@ -1,6 +1,7 @@
 # Exim test configuration 0402
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0403 b/test/confs/0403
index bdc84841a..a4e5f76eb 100644
--- a/test/confs/0403
+++ b/test/confs/0403
@@ -1,6 +1,7 @@
 # Exim test configuration 0403
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0404 b/test/confs/0404
index e9b23f0f0..76a1f74f3 100644
--- a/test/confs/0404
+++ b/test/confs/0404
@@ -1,6 +1,7 @@
 # Exim test configuration 0404
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0405 b/test/confs/0405
index d1f77cd82..3db8b2493 100644
--- a/test/confs/0405
+++ b/test/confs/0405
@@ -3,6 +3,7 @@
 UTF8=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0406 b/test/confs/0406
index 37b6bab07..f517624ff 100644
--- a/test/confs/0406
+++ b/test/confs/0406
@@ -1,6 +1,7 @@
 # Exim test configuration 0406
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0407 b/test/confs/0407
index 364786199..9dba8d7e0 100644
--- a/test/confs/0407
+++ b/test/confs/0407
@@ -4,6 +4,7 @@ HEADER_MAXSIZE=
 HEADER_LINE_MAXSIZE=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0408 b/test/confs/0408
index 6df40fa9e..413a50758 100644
--- a/test/confs/0408
+++ b/test/confs/0408
@@ -1,6 +1,7 @@
 # Exim test configuration 0408
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0409 b/test/confs/0409
index c077da26b..8f6564588 100644
--- a/test/confs/0409
+++ b/test/confs/0409
@@ -3,6 +3,7 @@
 BANNER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0410 b/test/confs/0410
index 8fb017178..dcc0f6419 100644
--- a/test/confs/0410
+++ b/test/confs/0410
@@ -1,6 +1,7 @@
 # Exim test configuration 0410
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0411 b/test/confs/0411
index c2c238507..aea60f897 100644
--- a/test/confs/0411
+++ b/test/confs/0411
@@ -1,6 +1,7 @@
 # Exim test configuration 0411
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0412 b/test/confs/0412
index 9a38058d7..fca635748 100644
--- a/test/confs/0412
+++ b/test/confs/0412
@@ -1,6 +1,7 @@
 # Exim test configuration 0412
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0413 b/test/confs/0413
index e0d4fa329..77133f891 100644
--- a/test/confs/0413
+++ b/test/confs/0413
@@ -1,6 +1,7 @@
 # Exim test configuration 0413
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0414 b/test/confs/0414
index 9d269d959..8dc486e17 100644
--- a/test/confs/0414
+++ b/test/confs/0414
@@ -1,6 +1,7 @@
 # Exim test configuration 0414
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0415 b/test/confs/0415
index aceaacc46..1bec61aac 100644
--- a/test/confs/0415
+++ b/test/confs/0415
@@ -5,6 +5,7 @@ ARG2=1.0
 VALUE=0
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0416 b/test/confs/0416
index 2290da4b3..58b7505ec 100644
--- a/test/confs/0416
+++ b/test/confs/0416
@@ -1,6 +1,7 @@
 # Exim test configuration 0416
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0417 b/test/confs/0417
index f759e63d6..e107c5a6e 100644
--- a/test/confs/0417
+++ b/test/confs/0417
@@ -3,6 +3,7 @@
 RETURN_ERROR_DETAILS = false
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0418 b/test/confs/0418
index b44214388..f6d7bae8d 100644
--- a/test/confs/0418
+++ b/test/confs/0418
@@ -1,6 +1,7 @@
 # Exim test configuration 0418
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0419 b/test/confs/0419
index 9fcf361db..a8c7d7d6d 100644
--- a/test/confs/0419
+++ b/test/confs/0419
@@ -1,6 +1,7 @@
 # Exim test configuration 0419
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0420 b/test/confs/0420
index 38cf50c22..242b00855 100644
--- a/test/confs/0420
+++ b/test/confs/0420
@@ -1,6 +1,7 @@
 # Exim test configuration 0420
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0421 b/test/confs/0421
index a65df5fdd..6b1143394 100644
--- a/test/confs/0421
+++ b/test/confs/0421
@@ -1,6 +1,7 @@
 # Exim test configuration 0421
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0422 b/test/confs/0422
index 5ad06071e..567bb7853 100644
--- a/test/confs/0422
+++ b/test/confs/0422
@@ -1,6 +1,7 @@
 # Exim test configuration 0422
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0423 b/test/confs/0423
index 30ba84b82..c6228f7e1 100644
--- a/test/confs/0423
+++ b/test/confs/0423
@@ -1,6 +1,7 @@
 # Exim test configuration 0423
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0424 b/test/confs/0424
index 902f9ccb8..0efbd6393 100644
--- a/test/confs/0424
+++ b/test/confs/0424
@@ -1,6 +1,7 @@
 # Exim test configuration 0424
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0425 b/test/confs/0425
index 5c4378fea..688cecf22 100644
--- a/test/confs/0425
+++ b/test/confs/0425
@@ -1,6 +1,7 @@
 # Exim test configuration 0425
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0426 b/test/confs/0426
index f50d54067..70e9a1a43 100644
--- a/test/confs/0426
+++ b/test/confs/0426
@@ -1,6 +1,7 @@
 # Exim test configuration 0426
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0427 b/test/confs/0427
index 95e6b5264..68f5512aa 100644
--- a/test/confs/0427
+++ b/test/confs/0427
@@ -1,6 +1,7 @@
 # Exim test configuration 0427
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0428 b/test/confs/0428
index 0fb20a14a..2c14aad61 100644
--- a/test/confs/0428
+++ b/test/confs/0428
@@ -1,6 +1,7 @@
 # Exim test configuration 0428
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0429 b/test/confs/0429
index 3dbf4fcb2..b543b05ca 100644
--- a/test/confs/0429
+++ b/test/confs/0429
@@ -1,6 +1,7 @@
 # Exim test configuration 0429
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0430 b/test/confs/0430
index b38f3057b..dd3a96ab0 100644
--- a/test/confs/0430
+++ b/test/confs/0430
@@ -4,6 +4,7 @@ LIST=
 SELF=freeze
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0431 b/test/confs/0431
index 33b3631c3..497481ef3 100644
--- a/test/confs/0431
+++ b/test/confs/0431
@@ -3,6 +3,7 @@
 AFFIX=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0432 b/test/confs/0432
index ffb97452f..bc1dc93de 100644
--- a/test/confs/0432
+++ b/test/confs/0432
@@ -1,6 +1,7 @@
 # Exim test configuration 0432
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0433 b/test/confs/0433
index 4513f6db0..81860a5ed 100644
--- a/test/confs/0433
+++ b/test/confs/0433
@@ -5,6 +5,7 @@ IFACE=
 
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0434 b/test/confs/0434
index 5616b9cee..aeff22f83 100644
--- a/test/confs/0434
+++ b/test/confs/0434
@@ -3,6 +3,7 @@
 ELI=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0435 b/test/confs/0435
index b251a0120..92dc1abb8 100644
--- a/test/confs/0435
+++ b/test/confs/0435
@@ -1,6 +1,7 @@
 # Exim test configuration 0435
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0436 b/test/confs/0436
index 9c24f1ff5..c9ac15027 100644
--- a/test/confs/0436
+++ b/test/confs/0436
@@ -1,6 +1,7 @@
 # Exim test configuration 0436
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
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..0a966451c 100644
--- a/test/confs/0438
+++ b/test/confs/0438
@@ -1,6 +1,7 @@
 # Exim test configuration 0438
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0439 b/test/confs/0439
index c63503634..25199dff8 100644
--- a/test/confs/0439
+++ b/test/confs/0439
@@ -1,6 +1,7 @@
 # Exim test configuration 0439
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0440 b/test/confs/0440
index 6a61c130a..7f264c84d 100644
--- a/test/confs/0440
+++ b/test/confs/0440
@@ -1,6 +1,7 @@
 # Exim test configuration 0440
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0441 b/test/confs/0441
index 3e10aa309..89adf7f97 100644
--- a/test/confs/0441
+++ b/test/confs/0441
@@ -1,6 +1,7 @@
 # Exim test configuration 0441
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0442 b/test/confs/0442
index 29ecc1568..0deb598c9 100644
--- a/test/confs/0442
+++ b/test/confs/0442
@@ -3,6 +3,7 @@
 BAD=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0443 b/test/confs/0443
index bd5dad286..df03b5dfb 100644
--- a/test/confs/0443
+++ b/test/confs/0443
@@ -1,6 +1,7 @@
 # Exim test configuration 0443
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0444 b/test/confs/0444
index f6dff0169..182d1021a 100644
--- a/test/confs/0444
+++ b/test/confs/0444
@@ -1,6 +1,7 @@
 # Exim test configuration 0444
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0445 b/test/confs/0445
index 32d3c6544..5d1a3e92d 100644
--- a/test/confs/0445
+++ b/test/confs/0445
@@ -1,6 +1,7 @@
 # Exim test configuration 0445
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0446 b/test/confs/0446
index 8adfcc6b1..290ea60be 100644
--- a/test/confs/0446
+++ b/test/confs/0446
@@ -1,6 +1,7 @@
 # Exim test configuration 0446
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0447 b/test/confs/0447
index 112978f88..2b4e5935f 100644
--- a/test/confs/0447
+++ b/test/confs/0447
@@ -3,6 +3,7 @@
 INSERT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0448 b/test/confs/0448
index cccf16498..cadec6310 100644
--- a/test/confs/0448
+++ b/test/confs/0448
@@ -1,6 +1,7 @@
 # Exim test configuration 0448
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0449 b/test/confs/0449
index 2d8c2f51e..6345b5897 100644
--- a/test/confs/0449
+++ b/test/confs/0449
@@ -1,6 +1,7 @@
 # Exim test configuration 0449
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0450 b/test/confs/0450
index 409098d30..511362db5 100644
--- a/test/confs/0450
+++ b/test/confs/0450
@@ -3,6 +3,7 @@
 EXTRA=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0451 b/test/confs/0451
index 6ae4d3c5e..0e7e0b14e 100644
--- a/test/confs/0451
+++ b/test/confs/0451
@@ -1,6 +1,7 @@
 # Exim test configuration 0451
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0452 b/test/confs/0452
index a8531320b..f7b7aa40a 100644
--- a/test/confs/0452
+++ b/test/confs/0452
@@ -1,6 +1,7 @@
 # Exim test configuration 0452
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0453 b/test/confs/0453
index e4294aeb2..755a9c000 100644
--- a/test/confs/0453
+++ b/test/confs/0453
@@ -3,6 +3,7 @@
 LIMIT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0454 b/test/confs/0454
index bb4e8b79e..2afdf517b 100644
--- a/test/confs/0454
+++ b/test/confs/0454
@@ -1,6 +1,7 @@
 # Exim test configuration 0454
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0455 b/test/confs/0455
index d6688d932..5937b4f04 100644
--- a/test/confs/0455
+++ b/test/confs/0455
@@ -3,6 +3,7 @@
 HOSTS_MAX_TRY=4
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0456 b/test/confs/0456
index da9814360..b62274ce9 100644
--- a/test/confs/0456
+++ b/test/confs/0456
@@ -3,6 +3,7 @@
 HOSTS_MAX_TRY=4
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0457 b/test/confs/0457
index c3538607e..b8f3d6d14 100644
--- a/test/confs/0457
+++ b/test/confs/0457
@@ -1,6 +1,7 @@
 # Exim test configuration 0457
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0458 b/test/confs/0458
index bb6e4fcb3..4ddcba5f7 100644
--- a/test/confs/0458
+++ b/test/confs/0458
@@ -1,6 +1,7 @@
 # Exim test configuration 0458
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0459 b/test/confs/0459
index f16dc0b3c..b07df6634 100644
--- a/test/confs/0459
+++ b/test/confs/0459
@@ -1,6 +1,7 @@
 # Exim test configuration 0459
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0460 b/test/confs/0460
index aa53b9722..b40bd0ce6 100644
--- a/test/confs/0460
+++ b/test/confs/0460
@@ -1,6 +1,7 @@
 # Exim test configuration 0460
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0461 b/test/confs/0461
index c78c2a94a..ac0206b1e 100644
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -6,6 +6,7 @@ RETRY1=1s
 RETRY2=2s
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0462 b/test/confs/0462
index 9e602a57f..84b63e1e4 100644
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -3,6 +3,7 @@
 SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0463 b/test/confs/0463
index 187ea46fe..1dcb8bd18 100644
--- a/test/confs/0463
+++ b/test/confs/0463
@@ -1,6 +1,7 @@
 # Exim test configuration 0463
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0464 b/test/confs/0464
index 8a484ee8f..ddf1afc79 100644
--- a/test/confs/0464
+++ b/test/confs/0464
@@ -1,6 +1,7 @@
 # Exim test configuration 0464
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0465 b/test/confs/0465
index 877e04487..35efd39a1 100644
--- a/test/confs/0465
+++ b/test/confs/0465
@@ -3,6 +3,7 @@
 STD=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0466 b/test/confs/0466
index 8cd7d6036..3544af289 100644
--- a/test/confs/0466
+++ b/test/confs/0466
@@ -1,6 +1,7 @@
 # Exim test configuration 0466
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0467 b/test/confs/0467
index 3d031a65d..9479b2b0b 100644
--- a/test/confs/0467
+++ b/test/confs/0467
@@ -3,6 +3,7 @@
 SRV=smtp
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0468 b/test/confs/0468
index 0baf45ba6..9eb84e1a6 100644
--- a/test/confs/0468
+++ b/test/confs/0468
@@ -3,6 +3,7 @@
 SRV=smtp
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0469 b/test/confs/0469
index 51f5bdfcb..8bf9e3408 100644
--- a/test/confs/0469
+++ b/test/confs/0469
@@ -3,6 +3,7 @@
 SRV=smtp
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0470 b/test/confs/0470
index aff710724..e02aa4ccd 100644
--- a/test/confs/0470
+++ b/test/confs/0470
@@ -3,6 +3,7 @@
 SRV=smtp
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0471 b/test/confs/0471
index bc6fd509f..d6e918816 100644
--- a/test/confs/0471
+++ b/test/confs/0471
@@ -1,6 +1,7 @@
 # Exim test configuration 0471
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0472 b/test/confs/0472
index b27bc6d8f..6bbd93fac 100644
--- a/test/confs/0472
+++ b/test/confs/0472
@@ -3,6 +3,7 @@
 FUSER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0473 b/test/confs/0473
index e9ea69db6..d733ff9ea 100644
--- a/test/confs/0473
+++ b/test/confs/0473
@@ -4,6 +4,7 @@ USE_SENDER = ,use_sender
 ACL_RCPT = acl_rcpt
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0474 b/test/confs/0474
index 5a6ddc528..bb6cfaf1c 100644
--- a/test/confs/0474
+++ b/test/confs/0474
@@ -1,6 +1,7 @@
 # Exim test configuration 0474
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0475 b/test/confs/0475
index 048c69118..4a38bec16 100644
--- a/test/confs/0475
+++ b/test/confs/0475
@@ -1,6 +1,7 @@
 # Exim test configuration 0475
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0476 b/test/confs/0476
index 084184aad..c67109895 100644
--- a/test/confs/0476
+++ b/test/confs/0476
@@ -1,6 +1,7 @@
 # Exim test configuration 0476
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0477 b/test/confs/0477
index 650552bb3..edca4b212 100644
--- a/test/confs/0477
+++ b/test/confs/0477
@@ -1,6 +1,7 @@
 # Exim test configuration 0477
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0478 b/test/confs/0478
index f3e11de23..243e47b2a 100644
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
diff --git a/test/confs/0479 b/test/confs/0479
index 048edebd8..67462c3d2 100644
--- a/test/confs/0479
+++ b/test/confs/0479
@@ -1,6 +1,7 @@
 # Exim test configuration 0479
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0480 b/test/confs/0480
index 0c0f2ca11..2b399144a 100644
--- a/test/confs/0480
+++ b/test/confs/0480
@@ -7,6 +7,7 @@ IP3=V4NET.0.0.3
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
diff --git a/test/confs/0481 b/test/confs/0481
index de976c5b5..c4f512fee 100644
--- a/test/confs/0481
+++ b/test/confs/0481
@@ -1,6 +1,7 @@
 # Exim test configuration 0481
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0482 b/test/confs/0482
index 20b06d88b..7f590909e 100644
--- a/test/confs/0482
+++ b/test/confs/0482
@@ -1,6 +1,7 @@
 # Exim test configuration 0482
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0483 b/test/confs/0483
index 530253b15..4475165fe 100644
--- a/test/confs/0483
+++ b/test/confs/0483
@@ -1,6 +1,7 @@
 # Exim test configuration 0483
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0484 b/test/confs/0484
index 3837a20ff..7c44a2845 100644
--- a/test/confs/0484
+++ b/test/confs/0484
@@ -1,6 +1,7 @@
 # Exim test configuration 0484
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0485 b/test/confs/0485
index 4b8a0dbb3..b1864e9bd 100644
--- a/test/confs/0485
+++ b/test/confs/0485
@@ -1,6 +1,7 @@
 # Exim test configuration 0485
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0486 b/test/confs/0486
index 7104bb7f5..6b0a2a21c 100644
--- a/test/confs/0486
+++ b/test/confs/0486
@@ -1,6 +1,7 @@
 # Exim test configuration 0486
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0487 b/test/confs/0487
index 8776d80f1..8511955ba 100644
--- a/test/confs/0487
+++ b/test/confs/0487
@@ -1,6 +1,7 @@
 # Exim test configuration 0487
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0488 b/test/confs/0488
index e687e95e9..ad1748eb1 100644
--- a/test/confs/0488
+++ b/test/confs/0488
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0489 b/test/confs/0489
index 7148b9cff..fcf666062 100644
--- a/test/confs/0489
+++ b/test/confs/0489
@@ -1,6 +1,7 @@
 # Exim test configuration 0489
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0490 b/test/confs/0490
index 0252d2dec..e4acefb1d 100644
--- a/test/confs/0490
+++ b/test/confs/0490
@@ -1,6 +1,7 @@
 # Exim test configuration 0490
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0491 b/test/confs/0491
index 8a0f0e819..a25b6ad7c 100644
--- a/test/confs/0491
+++ b/test/confs/0491
@@ -4,6 +4,7 @@ UL=abc@xyz
 REWRITE=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0492 b/test/confs/0492
index 0271d3b85..8e76eb743 100644
--- a/test/confs/0492
+++ b/test/confs/0492
@@ -1,6 +1,7 @@
 # Exim test configuration 0492
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0493 b/test/confs/0493
index 314fe92a4..675490770 100644
--- a/test/confs/0493
+++ b/test/confs/0493
@@ -1,6 +1,7 @@
 # Exim test configuration 0493
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0494 b/test/confs/0494
index 98a9c3109..d12d4c07b 100644
--- a/test/confs/0494
+++ b/test/confs/0494
@@ -1,6 +1,7 @@
 # Exim test configuration 0494
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0495 b/test/confs/0495
index bb7c5e332..a9585e006 100644
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -1,6 +1,7 @@
 # Exim test configuration 0495
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0496 b/test/confs/0496
index c30833d24..6f8add61d 100644
--- a/test/confs/0496
+++ b/test/confs/0496
@@ -1,6 +1,7 @@
 # Exim test configuration 0496
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0497 b/test/confs/0497
index af8fc81dd..08fc06631 100644
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -1,6 +1,7 @@
 # Exim test configuration 0497
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0498 b/test/confs/0498
index f55a0ab75..899b14a3d 100644
--- a/test/confs/0498
+++ b/test/confs/0498
@@ -1,6 +1,7 @@
 # Exim test configuration 0498
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0499 b/test/confs/0499
index ff6d2aaea..0261f1ee3 100644
--- a/test/confs/0499
+++ b/test/confs/0499
@@ -1,6 +1,7 @@
 # Exim test configuration 0499
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0500 b/test/confs/0500
index f07b20893..ac9c6eec6 100644
--- a/test/confs/0500
+++ b/test/confs/0500
@@ -1,6 +1,7 @@
 # Exim test configuration 0500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0501 b/test/confs/0501
index 5e18c7f73..6acd356e2 100644
--- a/test/confs/0501
+++ b/test/confs/0501
@@ -1,6 +1,7 @@
 # Exim test configuration 0501
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0502 b/test/confs/0502
index a6ff74c40..a9df68e18 100644
--- a/test/confs/0502
+++ b/test/confs/0502
@@ -3,6 +3,7 @@
 LAST=accept message = Your message here
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0503 b/test/confs/0503
index 6dccd559a..50e330093 100644
--- a/test/confs/0503
+++ b/test/confs/0503
@@ -3,6 +3,7 @@
 MSIZE=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0504 b/test/confs/0504
index 86f599d95..687173b4a 100644
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -1,6 +1,7 @@
 # Exim test configuration 0504
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0505 b/test/confs/0505
index 27ed59835..c931db4d3 100644
--- a/test/confs/0505
+++ b/test/confs/0505
@@ -5,6 +5,7 @@ CONTROL=
 RECIPIENT=acl_smtp_rcpt=accept
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0506 b/test/confs/0506
index 22fdaa181..971de86e2 100644
--- a/test/confs/0506
+++ b/test/confs/0506
@@ -4,6 +4,7 @@ ALLOW=allow_filter
 FORBID=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0507 b/test/confs/0507
index da500daf8..a204f64fd 100644
--- a/test/confs/0507
+++ b/test/confs/0507
@@ -3,6 +3,7 @@
 ERROR_DETAILS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0508 b/test/confs/0508
index c81919e7e..9dadd7139 100644
--- a/test/confs/0508
+++ b/test/confs/0508
@@ -1,6 +1,7 @@
 # Exim test configuration 0508
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0509 b/test/confs/0509
index c45f52d68..9ca2a3759 100644
--- a/test/confs/0509
+++ b/test/confs/0509
@@ -1,6 +1,7 @@
 # Exim test configuration 0509
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0510 b/test/confs/0510
index 2a7ee7d6e..b8545dc53 100644
--- a/test/confs/0510
+++ b/test/confs/0510
@@ -1,6 +1,7 @@
 # Exim test configuration 0510
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0511 b/test/confs/0511
index 685b1955b..af87c3011 100644
--- a/test/confs/0511
+++ b/test/confs/0511
@@ -1,6 +1,7 @@
 # Exim test configuration 0511
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0512 b/test/confs/0512
index 202acb29f..f2da0f304 100644
--- a/test/confs/0512
+++ b/test/confs/0512
@@ -3,6 +3,7 @@
 HARDLIMIT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0513 b/test/confs/0513
index ea76f3447..b023de35d 100644
--- a/test/confs/0513
+++ b/test/confs/0513
@@ -3,6 +3,7 @@
 HARDLIMIT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0514 b/test/confs/0514
index d52a76950..7c0cb1b7e 100644
--- a/test/confs/0514
+++ b/test/confs/0514
@@ -1,6 +1,7 @@
 # Exim test configuration 0514
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0515 b/test/confs/0515
index ad262e774..af38a1568 100644
--- a/test/confs/0515
+++ b/test/confs/0515
@@ -1,6 +1,7 @@
 # Exim test configuration 0515
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0516 b/test/confs/0516
index 2d5ea226a..086b880ec 100644
--- a/test/confs/0516
+++ b/test/confs/0516
@@ -1,6 +1,7 @@
 # Exim test configuration 0516
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0517 b/test/confs/0517
index 52663742a..6094e6be2 100644
--- a/test/confs/0517
+++ b/test/confs/0517
@@ -3,6 +3,7 @@
 ERROR_DETAILS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0518 b/test/confs/0518
index 979f99adf..b30acf42e 100644
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -1,6 +1,7 @@
 # Exim test configuration 0518
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0519 b/test/confs/0519
index 943c91818..8a9485549 100644
--- a/test/confs/0519
+++ b/test/confs/0519
@@ -1,6 +1,7 @@
 # Exim test configuration 0519
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0520 b/test/confs/0520
index f850c7c2f..083d49b7b 100644
--- a/test/confs/0520
+++ b/test/confs/0520
@@ -1,6 +1,7 @@
 # Exim test configuration 0520
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0521 b/test/confs/0521
index fb47004fd..b47129f14 100644
--- a/test/confs/0521
+++ b/test/confs/0521
@@ -1,6 +1,7 @@
 # Exim test configuration 0521
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0522 b/test/confs/0522
index 77f60c86a..fb282b6e7 100644
--- a/test/confs/0522
+++ b/test/confs/0522
@@ -3,6 +3,7 @@
 TIMEOUTDEFER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0523 b/test/confs/0523
index c3d9e6dc5..15374f8e2 100644
--- a/test/confs/0523
+++ b/test/confs/0523
@@ -1,6 +1,7 @@
 # Exim test configuration 0523
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0524 b/test/confs/0524
index 0d73654b2..a535db705 100644
--- a/test/confs/0524
+++ b/test/confs/0524
@@ -1,6 +1,7 @@
 # Exim test configuration 0524
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0525 b/test/confs/0525
index 04a0211f4..e1e736d4d 100644
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -1,6 +1,7 @@
 # Exim test configuration 0525
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0526 b/test/confs/0526
index e4fabf60c..8d0df009e 100644
--- a/test/confs/0526
+++ b/test/confs/0526
@@ -1,6 +1,7 @@
 # Exim test configuration 0526
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0527 b/test/confs/0527
index 57d51952e..1b312078f 100644
--- a/test/confs/0527
+++ b/test/confs/0527
@@ -1,6 +1,7 @@
 # Exim test configuration 0527
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0528 b/test/confs/0528
index a8de7aec8..6b08d9cf0 100644
--- a/test/confs/0528
+++ b/test/confs/0528
@@ -1,6 +1,7 @@
 # Exim test configuration 0528
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0529 b/test/confs/0529
index 282047f9f..52c31a55e 100644
--- a/test/confs/0529
+++ b/test/confs/0529
@@ -1,6 +1,7 @@
 # Exim test configuration 0529
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0530 b/test/confs/0530
index c919cb658..f1f9b0dc5 100644
--- a/test/confs/0530
+++ b/test/confs/0530
@@ -1,6 +1,7 @@
 # Exim test configuration 0530
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0531 b/test/confs/0531
index a66723188..c7dc39e7a 100644
--- a/test/confs/0531
+++ b/test/confs/0531
@@ -1,6 +1,7 @@
 # Exim test configuration 0531
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0532 b/test/confs/0532
index 4d45c2fd3..1ba2162c4 100644
--- a/test/confs/0532
+++ b/test/confs/0532
@@ -3,6 +3,7 @@
 CONNECTCOND=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0533 b/test/confs/0533
index b0a3347b6..1d48005e3 100644
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -1,6 +1,7 @@
 # Exim test configuration 0533
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0534 b/test/confs/0534
index d2bc84a76..4cb89c98f 100644
--- a/test/confs/0534
+++ b/test/confs/0534
@@ -1,6 +1,7 @@
 # Exim test configuration 0534
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0535 b/test/confs/0535
index 58cb1c425..67b4bbab6 100644
--- a/test/confs/0535
+++ b/test/confs/0535
@@ -1,6 +1,7 @@
 # Exim test configuration 0535
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0536 b/test/confs/0536
index 0582f6fb1..ba5baf10d 100644
--- a/test/confs/0536
+++ b/test/confs/0536
@@ -3,6 +3,7 @@
 FORBID_SMTP_CODE = false
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0537 b/test/confs/0537
index 7a2ac9276..90c901be4 100644
--- a/test/confs/0537
+++ b/test/confs/0537
@@ -3,6 +3,7 @@
 TRUSTED=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0538 b/test/confs/0538
index 6fbeeb23a..1c4cf990e 100644
--- a/test/confs/0538
+++ b/test/confs/0538
@@ -1,6 +1,7 @@
 # Exim test configuration 0538
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0539 b/test/confs/0539
index e70a452f1..de89c3f6c 100644
--- a/test/confs/0539
+++ b/test/confs/0539
@@ -1,6 +1,7 @@
 # Exim test configuration 0539
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0540 b/test/confs/0540
index b5e183638..b05108cf5 100644
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -1,6 +1,7 @@
 # Exim test configuration 0540
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0541 b/test/confs/0541
index d1b8f601b..ffc20d0af 100644
--- a/test/confs/0541
+++ b/test/confs/0541
@@ -1,6 +1,7 @@
 # Exim test configuration 0541
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0542 b/test/confs/0542
index 1f22fe0d5..36348e4f8 100644
--- a/test/confs/0542
+++ b/test/confs/0542
@@ -1,6 +1,7 @@
 # Exim test configuration 0542
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0543 b/test/confs/0543
index dcfcd303a..316e5abe4 100644
--- a/test/confs/0543
+++ b/test/confs/0543
@@ -1,6 +1,7 @@
 # Exim test configuration 0543
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0544 b/test/confs/0544
index b5c9d73cf..8d656ed88 100644
--- a/test/confs/0544
+++ b/test/confs/0544
@@ -1,6 +1,7 @@
 # Exim test configuration 0544
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0545 b/test/confs/0545
index 86501e32c..890afb7b1 100644
--- a/test/confs/0545
+++ b/test/confs/0545
@@ -1,6 +1,7 @@
 # Exim test configuration 0545
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0546 b/test/confs/0546
index 7de92304c..788ce905a 100644
--- a/test/confs/0546
+++ b/test/confs/0546
@@ -4,6 +4,7 @@ HELO_MSG=One line
 RCPT_MSG=RCPT is OK
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0547 b/test/confs/0547
index e8e8eedd4..0e04da3f8 100644
--- a/test/confs/0547
+++ b/test/confs/0547
@@ -3,6 +3,7 @@
 MAXNM = 100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0548 b/test/confs/0548
index faa1ffad3..f0f418958 100644
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
diff --git a/test/confs/0549 b/test/confs/0549
index fd07a54ed..4578f0c45 100644
--- a/test/confs/0549
+++ b/test/confs/0549
@@ -1,6 +1,7 @@
 # Exim test configuration 0549
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0550 b/test/confs/0550
index f35ca9f67..621c3a1f4 100644
--- a/test/confs/0550
+++ b/test/confs/0550
@@ -1,6 +1,7 @@
 # Exim test configuration 0550
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0551 b/test/confs/0551
index 102f4ceeb..a29f75051 100644
--- a/test/confs/0551
+++ b/test/confs/0551
@@ -3,6 +3,7 @@
 LS=+pid
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0552 b/test/confs/0552
index 9653e807e..f676cd4a2 100644
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -4,6 +4,7 @@ DDF=
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0553 b/test/confs/0553
index 36c5c8748..523be00eb 100644
--- a/test/confs/0553
+++ b/test/confs/0553
@@ -4,6 +4,7 @@ DCF =
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0554 b/test/confs/0554
index fc7c986a6..b76286b13 100644
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -1,6 +1,7 @@
 # Exim test configuration 0554
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0555 b/test/confs/0555
index 2dbfa9da1..eceba18b6 100644
--- a/test/confs/0555
+++ b/test/confs/0555
@@ -3,6 +3,7 @@
 FAKE=fakereject
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0556 b/test/confs/0556
index 81fc19593..16d8f9957 100644
--- a/test/confs/0556
+++ b/test/confs/0556
@@ -6,6 +6,7 @@ ACL_PREDATA=accept
 PAH=127.0.0.1
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0557 b/test/confs/0557
index 3c5d55197..0452e851d 100644
--- a/test/confs/0557
+++ b/test/confs/0557
@@ -6,6 +6,7 @@ HOSTS=
 HAI=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0558 b/test/confs/0558
index 13159ad37..55b149cf6 100644
--- a/test/confs/0558
+++ b/test/confs/0558
@@ -1,6 +1,7 @@
 # Exim test configuration 0558
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0559 b/test/confs/0559
index e97c8bb41..dbcdc7b61 100644
--- a/test/confs/0559
+++ b/test/confs/0559
@@ -1,6 +1,7 @@
 # Exim test configuration 0559
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0560 b/test/confs/0560
index edea9c30b..f7f85fc46 100644
--- a/test/confs/0560
+++ b/test/confs/0560
@@ -1,6 +1,7 @@
 # Exim test configuration 0560
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0561 b/test/confs/0561
index c36031cf8..f895e6c58 100644
--- a/test/confs/0561
+++ b/test/confs/0561
@@ -3,6 +3,7 @@
 QOLL=true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0562 b/test/confs/0562
index 3b478c1c9..31e631c99 100644
--- a/test/confs/0562
+++ b/test/confs/0562
@@ -1,6 +1,7 @@
 # Exim test configuration 0562
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
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..e464f963c 100644
--- a/test/confs/0564
+++ b/test/confs/0564
@@ -1,6 +1,7 @@
 # Exim test configuration 0564
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0565 b/test/confs/0565
index 397536342..8233e1a79 100644
--- a/test/confs/0565
+++ b/test/confs/0565
@@ -1,6 +1,7 @@
 # Exim test configuration 0565
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0566 b/test/confs/0566
index e4433f8f8..34b36f53d 100644
--- a/test/confs/0566
+++ b/test/confs/0566
@@ -1,6 +1,7 @@
 # Exim test configuration 0566
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0567 b/test/confs/0567
index e6850b8bd..c23d7da8a 100644
--- a/test/confs/0567
+++ b/test/confs/0567
@@ -3,6 +3,7 @@
 CONNECTCOND=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0569 b/test/confs/0569
index e6ab3f692..b9bf32d73 100644
--- a/test/confs/0569
+++ b/test/confs/0569
@@ -1,6 +1,7 @@
 # Exim test configuration 0569
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0570 b/test/confs/0570
index eb7218138..0ed683927 100644
--- a/test/confs/0570
+++ b/test/confs/0570
@@ -4,6 +4,7 @@
 OPTION =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/0571 b/test/confs/0571
index 64383cdd8..79b816ac7 100644
--- a/test/confs/0571
+++ b/test/confs/0571
@@ -3,6 +3,7 @@
 LOG_SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0572 b/test/confs/0572
index f09e52177..9ceeffc8e 100644
--- a/test/confs/0572
+++ b/test/confs/0572
@@ -3,6 +3,7 @@
 OPT =
 
 exim_path = EXIM_PATH
+keep_environment =
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0573 b/test/confs/0573
index c3c7a6bea..49169756f 100644
--- a/test/confs/0573
+++ b/test/confs/0573
@@ -1,6 +1,7 @@
 # Exim test configuration 0573
 
 exim_path = EXIM_PATH
+keep_environment =
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0600 b/test/confs/0600
index 671925956..103ecfbaa 100644
--- a/test/confs/0600
+++ b/test/confs/0600
@@ -2,6 +2,7 @@
 # utf8clean:string
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
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..9048b092c 100644
--- a/test/confs/0602
+++ b/test/confs/0602
@@ -1,6 +1,7 @@
 # Exim test configuration 0602
 
 exim_path = EXIM_PATH
+keep_environment =
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
diff --git a/test/confs/0603 b/test/confs/0603
index 7709de246..44dc86606 100644
--- a/test/confs/0603
+++ b/test/confs/0603
@@ -8,6 +8,7 @@ untrusted_set_sender = *
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 #primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0604 b/test/confs/0604
index 3766c3300..80c130cbe 100644
--- a/test/confs/0604
+++ b/test/confs/0604
@@ -7,6 +7,7 @@ untrusted_set_sender = *
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 #primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0605 b/test/confs/0605
index 44ccb63c7..0c81dea7b 100644
--- a/test/confs/0605
+++ b/test/confs/0605
@@ -1,6 +1,7 @@
 # Exim test configuration 0605
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
diff --git a/test/confs/0606 b/test/confs/0606
index bb94edb29..b29bf45d3 100644
--- a/test/confs/0606
+++ b/test/confs/0606
@@ -1,6 +1,7 @@
 # Exim test configuration 0606
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
diff --git a/test/confs/0607 b/test/confs/0607
index 932ae4c67..a8ea01943 100644
--- a/test/confs/0607
+++ b/test/confs/0607
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
diff --git a/test/confs/0608 b/test/confs/0608
index b88f32e12..17ddc1b14 100644
--- a/test/confs/0608
+++ b/test/confs/0608
@@ -1,6 +1,7 @@
 # Exim test configuration 0608
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0609 b/test/confs/0609
index 2b2f25d2b..45eb099d7 100644
--- a/test/confs/0609
+++ b/test/confs/0609
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0610 b/test/confs/0610
index 23c5b2cbd..9f1e25307 100644
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 #primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/0611 b/test/confs/0611
index b52639198..e8b4c51d4 100644
--- a/test/confs/0611
+++ b/test/confs/0611
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0612 b/test/confs/0612
index 3439ecb84..cac65b184 100644
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -2,6 +2,7 @@
 # log_defer_output on pipe transport
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0613 b/test/confs/0613
index a5ec4f856..a2243930a 100644
--- a/test/confs/0613
+++ b/test/confs/0613
@@ -2,6 +2,7 @@
 # manualroute, hosts_randomize and multiple recipients
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0614 b/test/confs/0614
index 2b2361747..4d90095a7 100644
--- a/test/confs/0614
+++ b/test/confs/0614
@@ -2,6 +2,7 @@
 # hosts_connection_nolog versus sender_host lists caching
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/0615 b/test/confs/0615
new file mode 100644
index 000000000..bbfc4978a
--- /dev/null
+++ b/test/confs/0615
@@ -0,0 +1,6 @@
+# exim test configuration 0615
+exim_path = EXIM_PATH
+tls_advertise_hosts =
+perl_startup = $| = 1; \
+	print "Environment visible in Perl:\n"; \
+	print map { "$_=$ENV{$_}\n" } sort keys %ENV;
diff --git a/test/confs/0616 b/test/confs/0616
new file mode 100644
index 000000000..7962d9734
--- /dev/null
+++ b/test/confs/0616
@@ -0,0 +1,8 @@
+# exim test configuration 0616
+exim_path = EXIM_PATH
+keep_environment = ^FOO\d : BAR
+add_environment = ADDED1=added1 : ADDED2=added2
+tls_advertise_hosts =
+perl_startup = $| = 1; \
+	print "Environment visible in Perl:\n"; \
+	print map { "$_=$ENV{$_}\n" } sort keys %ENV;
diff --git a/test/confs/1000 b/test/confs/1000
index b05acde77..59c113d22 100644
--- a/test/confs/1000
+++ b/test/confs/1000
@@ -3,6 +3,7 @@
 HL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/1001 b/test/confs/1001
index 49d367d7b..1fc4aaa11 100644
--- a/test/confs/1001
+++ b/test/confs/1001
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/1002 b/test/confs/1002
index 8210a10f3..f39ea1e9b 100644
--- a/test/confs/1002
+++ b/test/confs/1002
@@ -1,6 +1,7 @@
 # Exim test configuration 1002
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/1003 b/test/confs/1003
index 386ebb30c..b000339d8 100644
--- a/test/confs/1003
+++ b/test/confs/1003
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/1005 b/test/confs/1005
index d19571b82..f3a2b62a2 100644
--- a/test/confs/1005
+++ b/test/confs/1005
@@ -1,6 +1,7 @@
 # Exim test configuration 1005
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/1006 b/test/confs/1006
index e053d1b09..56610fdff 100644
--- a/test/confs/1006
+++ b/test/confs/1006
@@ -4,6 +4,7 @@ SERVER=
 D6=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/1007 b/test/confs/1007
index 2bcd150a9..7ab9688cc 100644
--- a/test/confs/1007
+++ b/test/confs/1007
@@ -5,6 +5,7 @@ IFACE=
 
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/1008 b/test/confs/1008
index cc76315ef..087ae5aea 100644
--- a/test/confs/1008
+++ b/test/confs/1008
@@ -1,6 +1,7 @@
 # Exim test configuration 1008
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/1009 b/test/confs/1009
index 99b78d9c1..a9aa730f4 100644
--- a/test/confs/1009
+++ b/test/confs/1009
@@ -1,6 +1,7 @@
 # Exim test configuration 1009
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/1010 b/test/confs/1010
index fde1f7539..ac4407168 100644
--- a/test/confs/1010
+++ b/test/confs/1010
@@ -1,6 +1,7 @@
 # Exim test configuration 1010
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2000 b/test/confs/2000
index 7a2d34b2f..c34c4f313 100644
--- a/test/confs/2000
+++ b/test/confs/2000
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2001 b/test/confs/2001
index e2572df3a..f1dc48078 100644
--- a/test/confs/2001
+++ b/test/confs/2001
@@ -4,6 +4,7 @@ OPTION=
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2002 b/test/confs/2002
index 76e6f1eec..679dccf96 100644
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -1,6 +1,7 @@
 # Exim test configuration 2002
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2003 b/test/confs/2003
index 8631514b8..17a781911 100644
--- a/test/confs/2003
+++ b/test/confs/2003
@@ -1,6 +1,7 @@
 # Exim test configuration 2003
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2004 b/test/confs/2004
index 2979685ec..7fc1ab261 100644
--- a/test/confs/2004
+++ b/test/confs/2004
@@ -1,6 +1,7 @@
 # Exim test configuration 2004
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2005 b/test/confs/2005
index 5b57b60ff..519eb06ab 100644
--- a/test/confs/2005
+++ b/test/confs/2005
@@ -1,6 +1,7 @@
 # Exim test configuration 2005
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2006 b/test/confs/2006
index 8c1a13da2..3808ceeb9 100644
--- a/test/confs/2006
+++ b/test/confs/2006
@@ -1,6 +1,7 @@
 # Exim test configuration 2006
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2007 b/test/confs/2007
index 5bdf76f03..934387512 100644
--- a/test/confs/2007
+++ b/test/confs/2007
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2008 b/test/confs/2008
index 4bad74a1b..a84ced8a2 100644
--- a/test/confs/2008
+++ b/test/confs/2008
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2009 b/test/confs/2009
index 66fadea29..dbc8b871e 100644
--- a/test/confs/2009
+++ b/test/confs/2009
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2010 b/test/confs/2010
index 34383c25a..bc1225fd3 100644
--- a/test/confs/2010
+++ b/test/confs/2010
@@ -5,6 +5,7 @@ TIMES =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2012 b/test/confs/2012
index 59265d407..5148a90ea 100644
--- a/test/confs/2012
+++ b/test/confs/2012
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2013 b/test/confs/2013
index 331dd09ef..bddd8ac4a 100644
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2014 b/test/confs/2014
index 562e916fd..f5fc2bb2d 100644
--- a/test/confs/2014
+++ b/test/confs/2014
@@ -3,6 +3,7 @@
 CRL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2015 b/test/confs/2015
index 734c2834a..cdf3e592b 100644
--- a/test/confs/2015
+++ b/test/confs/2015
@@ -1,6 +1,7 @@
 # Exim test configuration 2015
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2016 b/test/confs/2016
index ef6e14463..c706e2d11 100644
--- a/test/confs/2016
+++ b/test/confs/2016
@@ -1,6 +1,7 @@
 # Exim test configuration 2016
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/2017 b/test/confs/2017
index 26b257cd5..b61fba587 100644
--- a/test/confs/2017
+++ b/test/confs/2017
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2018 b/test/confs/2018
index 4afe33b96..6f61f9832 100644
--- a/test/confs/2018
+++ b/test/confs/2018
@@ -1,6 +1,7 @@
 # Exim test configuration 2018
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2019 b/test/confs/2019
index 798eb73d7..57c527d30 100644
--- a/test/confs/2019
+++ b/test/confs/2019
@@ -1,6 +1,7 @@
 # Exim test configuration 2019
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2020 b/test/confs/2020
index 7bde46415..241d88335 100644
--- a/test/confs/2020
+++ b/test/confs/2020
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
diff --git a/test/confs/2021 b/test/confs/2021
index 97b98d6ad..bb80cdd93 100644
--- a/test/confs/2021
+++ b/test/confs/2021
@@ -4,6 +4,7 @@ REQUIRE=#
 TRYCLEAR=#
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2022 b/test/confs/2022
index d11dd5e9e..b4d098c94 100644
--- a/test/confs/2022
+++ b/test/confs/2022
@@ -1,6 +1,7 @@
 # Exim test configuration 2022
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2023 b/test/confs/2023
index 849840404..e735334d6 100644
--- a/test/confs/2023
+++ b/test/confs/2023
@@ -1,6 +1,7 @@
 # Exim test configuration 2023
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2024 b/test/confs/2024
index 438899444..9d10d006d 100644
--- a/test/confs/2024
+++ b/test/confs/2024
@@ -4,6 +4,7 @@ CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2025 b/test/confs/2025
index ccb56dcb2..ac1476b10 100644
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
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..6429fec7d 100644
--- a/test/confs/2027
+++ b/test/confs/2027
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2028 b/test/confs/2028
index 38c14f249..71d708d57 100644
--- a/test/confs/2028
+++ b/test/confs/2028
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2029 b/test/confs/2029
index b98cf7348..0fdd8e617 100644
--- a/test/confs/2029
+++ b/test/confs/2029
@@ -1,6 +1,7 @@
 # Exim test configuration 2029
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2030 b/test/confs/2030
index e89e1c99f..80bf30b3e 100644
--- a/test/confs/2030
+++ b/test/confs/2030
@@ -4,6 +4,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2031 b/test/confs/2031
index 5791316c1..d7e140844 100644
--- a/test/confs/2031
+++ b/test/confs/2031
@@ -4,6 +4,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2032 b/test/confs/2032
index 002c31391..0ecd87b44 100644
--- a/test/confs/2032
+++ b/test/confs/2032
@@ -1,6 +1,7 @@
 # Exim test configuration 2032 (close copy of 2002)
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2033 b/test/confs/2033
index 9ed671172..944c5e7ca 100644
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2100 b/test/confs/2100
index dc8ec61ac..df56723d3 100644
--- a/test/confs/2100
+++ b/test/confs/2100
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2101 b/test/confs/2101
index a8de8c06d..c404caadd 100644
--- a/test/confs/2101
+++ b/test/confs/2101
@@ -4,6 +4,7 @@ OPTION=
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2102 b/test/confs/2102
index 1de92e962..b7893de75 100644
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -1,6 +1,7 @@
 # Exim test configuration 2102
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2103 b/test/confs/2103
index a9bc0ea7f..fc56df40d 100644
--- a/test/confs/2103
+++ b/test/confs/2103
@@ -1,6 +1,7 @@
 # Exim test configuration 2103
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2104 b/test/confs/2104
index 610a5b722..8118ef889 100644
--- a/test/confs/2104
+++ b/test/confs/2104
@@ -1,6 +1,7 @@
 # Exim test configuration 2104
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2105 b/test/confs/2105
index ec364a3c3..1b9444aa5 100644
--- a/test/confs/2105
+++ b/test/confs/2105
@@ -1,6 +1,7 @@
 # Exim test configuration 2105
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2106 b/test/confs/2106
index d8c685eb5..1857f6c94 100644
--- a/test/confs/2106
+++ b/test/confs/2106
@@ -1,6 +1,7 @@
 # Exim test configuration 2106
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2107 b/test/confs/2107
index b1e1967b7..34fb338bc 100644
--- a/test/confs/2107
+++ b/test/confs/2107
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2108 b/test/confs/2108
index 0388d0cc6..a32e7e46a 100644
--- a/test/confs/2108
+++ b/test/confs/2108
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2109 b/test/confs/2109
index 3e151936f..4987211e1 100644
--- a/test/confs/2109
+++ b/test/confs/2109
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2110 b/test/confs/2110
index db6864863..045f21d9a 100644
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -4,6 +4,7 @@ SERVER =
 HOSTS = 127.0.0.1 : HOSTIPV4
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2111 b/test/confs/2111
index 9abfc7a1a..d69f2a612 100644
--- a/test/confs/2111
+++ b/test/confs/2111
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2112 b/test/confs/2112
index 18b2fd780..38283826d 100644
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2113 b/test/confs/2113
index d9ac50447..3ba6bc620 100644
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2114 b/test/confs/2114
index a2b1c526f..d856e98bc 100644
--- a/test/confs/2114
+++ b/test/confs/2114
@@ -3,6 +3,7 @@
 CRL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2115 b/test/confs/2115
index 8142100aa..f28f02260 100644
--- a/test/confs/2115
+++ b/test/confs/2115
@@ -1,6 +1,7 @@
 # Exim test configuration 2115
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2116 b/test/confs/2116
index fbfb6dc56..b9f3cd8e1 100644
--- a/test/confs/2116
+++ b/test/confs/2116
@@ -1,6 +1,7 @@
 # Exim test configuration 2116
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/2117 b/test/confs/2117
index 8bf80f2b8..8a56c713d 100644
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2118 b/test/confs/2118
index 7ddc16140..5d2d193f8 100644
--- a/test/confs/2118
+++ b/test/confs/2118
@@ -1,6 +1,7 @@
 # Exim test configuration 2118
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2119 b/test/confs/2119
index 7d382d9ac..f4c228650 100644
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -1,6 +1,7 @@
 # Exim test configuration 2119
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2120 b/test/confs/2120
index c0225e819..e3a0ba1af 100644
--- a/test/confs/2120
+++ b/test/confs/2120
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
diff --git a/test/confs/2121 b/test/confs/2121
index c9a28c987..166278f7e 100644
--- a/test/confs/2121
+++ b/test/confs/2121
@@ -4,6 +4,7 @@ REQUIRE=#
 TRYCLEAR=#
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2122 b/test/confs/2122
index 510efdaab..477812e3c 100644
--- a/test/confs/2122
+++ b/test/confs/2122
@@ -1,6 +1,7 @@
 # Exim test configuration 2122
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2123 b/test/confs/2123
index 6170caaa8..d5da83ef5 100644
--- a/test/confs/2123
+++ b/test/confs/2123
@@ -1,6 +1,7 @@
 # Exim test configuration 2123
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2124 b/test/confs/2124
index 930f4b6d5..2809f6ce9 100644
--- a/test/confs/2124
+++ b/test/confs/2124
@@ -4,6 +4,7 @@ CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2125 b/test/confs/2125
index 20f8e1dfa..95b3f0d2d 100644
--- a/test/confs/2125
+++ b/test/confs/2125
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2126 b/test/confs/2126
index 3ea1d9c47..182895a19 100644
--- a/test/confs/2126
+++ b/test/confs/2126
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2127 b/test/confs/2127
index 786134cae..da7d2867f 100644
--- a/test/confs/2127
+++ b/test/confs/2127
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2128 b/test/confs/2128
index 3aa44e8ce..6b43541d5 100644
--- a/test/confs/2128
+++ b/test/confs/2128
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2130 b/test/confs/2130
index 6354b7cc3..6040c1fa6 100644
--- a/test/confs/2130
+++ b/test/confs/2130
@@ -4,6 +4,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2131 b/test/confs/2131
index 3d83099d1..cb5c4a714 100644
--- a/test/confs/2131
+++ b/test/confs/2131
@@ -4,6 +4,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2132 b/test/confs/2132
index 11dc3ce21..804cd749d 100644
--- a/test/confs/2132
+++ b/test/confs/2132
@@ -1,6 +1,7 @@
 # Exim test configuration 2132 (close copy of 2102)
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2133 b/test/confs/2133
index 064a97acf..93ad43f04 100644
--- a/test/confs/2133
+++ b/test/confs/2133
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2149 b/test/confs/2149
index 1d649e952..810ab712a 100644
--- a/test/confs/2149
+++ b/test/confs/2149
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2150 b/test/confs/2150
index 3b27f41c9..50df137fb 100644
--- a/test/confs/2150
+++ b/test/confs/2150
@@ -1,6 +1,7 @@
 # Exim test configuration 2150
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2200 b/test/confs/2200
index c57c8c796..65919ba8e 100644
--- a/test/confs/2200
+++ b/test/confs/2200
@@ -2,6 +2,7 @@
 # Check for dnsdb cache TTL handling
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2201 b/test/confs/2201
index b60439e29..c463033fc 100644
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -1,6 +1,7 @@
 # Exim test configuration 2201
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2202 b/test/confs/2202
index e2cf9d421..62272a0ab 100644
--- a/test/confs/2202
+++ b/test/confs/2202
@@ -3,6 +3,7 @@
 CONNECTCOND=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2250 b/test/confs/2250
index 96513bd23..dd097fad8 100644
--- a/test/confs/2250
+++ b/test/confs/2250
@@ -1,6 +1,7 @@
 # Exim test configuration 2250
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2300 b/test/confs/2300
index d8bc1b26f..018457c7b 100644
--- a/test/confs/2300
+++ b/test/confs/2300
@@ -1,6 +1,7 @@
 # Exim test configuration 2300
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2400 b/test/confs/2400
index 69ef73c6b..91915ae1d 100644
--- a/test/confs/2400
+++ b/test/confs/2400
@@ -1,6 +1,7 @@
 # Exim test configuration 2400
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2500 b/test/confs/2500
index 1eabf09e4..a4c12adf0 100644
--- a/test/confs/2500
+++ b/test/confs/2500
@@ -1,6 +1,7 @@
 # Exim test configuration 2500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2501 b/test/confs/2501
index 655a3712d..2fd56f130 100644
--- a/test/confs/2501
+++ b/test/confs/2501
@@ -1,6 +1,7 @@
 # Exim test configuration 2501
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2600 b/test/confs/2600
index c84d54fec..ea855471e 100644
--- a/test/confs/2600
+++ b/test/confs/2600
@@ -1,6 +1,7 @@
 # Exim test configuration 2600
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/2700 b/test/confs/2700
index bb001681d..d6daf0eb2 100644
--- a/test/confs/2700
+++ b/test/confs/2700
@@ -1,6 +1,7 @@
 # Exim test configuration 2700
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3000 b/test/confs/3000
index 80c6019a1..4b41aab70 100644
--- a/test/confs/3000
+++ b/test/confs/3000
@@ -1,6 +1,7 @@
 # Exim test configuration 3000
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3100 b/test/confs/3100
index 3eb114882..58ecc663f 100644
--- a/test/confs/3100
+++ b/test/confs/3100
@@ -1,6 +1,7 @@
 # Exim test configuration 3100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3200 b/test/confs/3200
index 105676976..c82c704a3 100644
--- a/test/confs/3200
+++ b/test/confs/3200
@@ -1,6 +1,7 @@
 # Exim test configuration 3200
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3201 b/test/confs/3201
index 478102c38..337f90a0c 100644
--- a/test/confs/3201
+++ b/test/confs/3201
@@ -1,6 +1,7 @@
 # Exim test configuration 3201
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3202 b/test/confs/3202
index b24085c8c..3c75e2138 100644
--- a/test/confs/3202
+++ b/test/confs/3202
@@ -1,6 +1,7 @@
 # Exim test configuration 3202
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3203 b/test/confs/3203
index affd4078d..22f0813a8 100644
--- a/test/confs/3203
+++ b/test/confs/3203
@@ -1,6 +1,7 @@
 # Exim test configuration 3203
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3204 b/test/confs/3204
index c1574aeb4..a7326acda 100644
--- a/test/confs/3204
+++ b/test/confs/3204
@@ -1,6 +1,7 @@
 # Exim test configuration 3204
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3205 b/test/confs/3205
index c53bca0fd..a2e5b4e87 100644
--- a/test/confs/3205
+++ b/test/confs/3205
@@ -1,6 +1,7 @@
 # Exim test configuration 3205
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3206 b/test/confs/3206
index 670777b4a..f4a64bd5e 100644
--- a/test/confs/3206
+++ b/test/confs/3206
@@ -1,6 +1,7 @@
 # Exim test configuration 3206
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3207 b/test/confs/3207
index ba7446d28..955444086 100644
--- a/test/confs/3207
+++ b/test/confs/3207
@@ -1,6 +1,7 @@
 # Exim test configuration 3207
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3208 b/test/confs/3208
index 015215d8e..1fa360d43 100644
--- a/test/confs/3208
+++ b/test/confs/3208
@@ -1,6 +1,7 @@
 # Exim test configuration 3208
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3209 b/test/confs/3209
index d78fcf3c8..ebaa4ebdd 100644
--- a/test/confs/3209
+++ b/test/confs/3209
@@ -1,6 +1,7 @@
 # Exim test configuration 3209
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
diff --git a/test/confs/3210 b/test/confs/3210
index ffd6a1fbb..3478c8aed 100644
--- a/test/confs/3210
+++ b/test/confs/3210
@@ -1,6 +1,7 @@
 # Exim test configuration 3210
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3211 b/test/confs/3211
index 063cebc45..c179b0a33 100644
--- a/test/confs/3211
+++ b/test/confs/3211
@@ -1,6 +1,7 @@
 # Exim test configuration 3211
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3212 b/test/confs/3212
index 35bf4d38b..1627194b3 100644
--- a/test/confs/3212
+++ b/test/confs/3212
@@ -1,6 +1,7 @@
 # Exim test configuration 3212
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3213 b/test/confs/3213
index 5d658e71e..f80f55d2f 100644
--- a/test/confs/3213
+++ b/test/confs/3213
@@ -1,6 +1,7 @@
 # Exim test configuration 3213
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3300 b/test/confs/3300
index 2dbf0b67f..85e5d75dd 100644
--- a/test/confs/3300
+++ b/test/confs/3300
@@ -1,6 +1,7 @@
 # Exim test configuration 3300
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3400 b/test/confs/3400
index cf896819f..8496e435b 100644
--- a/test/confs/3400
+++ b/test/confs/3400
@@ -1,6 +1,7 @@
 # Exim test configuration 3400
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3401 b/test/confs/3401
index 058e3f554..bfb9b3795 100644
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -1,6 +1,7 @@
 # Exim test configuration 3401
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3402 b/test/confs/3402
index 0f35779f0..35b45f1a4 100644
--- a/test/confs/3402
+++ b/test/confs/3402
@@ -1,6 +1,7 @@
 # Exim test configuration 3402
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3403 b/test/confs/3403
index 47827809f..9f62506da 100644
--- a/test/confs/3403
+++ b/test/confs/3403
@@ -1,6 +1,7 @@
 # Exim test configuration 3403
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3404 b/test/confs/3404
index 2a235ed95..b9d07b1cc 100644
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -1,6 +1,7 @@
 # Exim test configuration 3404
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3405 b/test/confs/3405
index 90576fc5e..f1079ac93 100644
--- a/test/confs/3405
+++ b/test/confs/3405
@@ -1,6 +1,7 @@
 # Exim test configuration 3405
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3406 b/test/confs/3406
index b2515ee56..fa567ba49 100644
--- a/test/confs/3406
+++ b/test/confs/3406
@@ -1,6 +1,7 @@
 # Exim test configuration 3406
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3407 b/test/confs/3407
index 8d8b50b89..ac7390021 100644
--- a/test/confs/3407
+++ b/test/confs/3407
@@ -3,6 +3,7 @@
 OPTION=server_condition = xxx
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/3408 b/test/confs/3408
index 7a28404c4..e3e9a4b04 100644
--- a/test/confs/3408
+++ b/test/confs/3408
@@ -1,6 +1,7 @@
 # Exim test configuration 3408
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/3409 b/test/confs/3409
index dd3b8d2ed..de5957484 100644
--- a/test/confs/3409
+++ b/test/confs/3409
@@ -1,6 +1,7 @@
 # Exim test configuration 3409
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/3410 b/test/confs/3410
index 8beadb7f2..dc05734b0 100644
--- a/test/confs/3410
+++ b/test/confs/3410
@@ -1,6 +1,7 @@
 # Exim test configuration 3410
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3411 b/test/confs/3411
index 3f721d797..2e521db92 100644
--- a/test/confs/3411
+++ b/test/confs/3411
@@ -1,6 +1,7 @@
 # Exim test configuration 3411
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3412 b/test/confs/3412
index 1bdb9d8e2..ea9ad6689 100644
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -1,6 +1,7 @@
 # Exim test configuration 3412
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3413 b/test/confs/3413
index c0eae2022..bce9cb0fa 100644
--- a/test/confs/3413
+++ b/test/confs/3413
@@ -1,6 +1,7 @@
 # Exim test configuration 3413
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3414 b/test/confs/3414
index 8e0c93c4a..e151e5fbc 100644
--- a/test/confs/3414
+++ b/test/confs/3414
@@ -4,6 +4,7 @@ ACL=
 S=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3415 b/test/confs/3415
index 31503df48..c468d6423 100644
--- a/test/confs/3415
+++ b/test/confs/3415
@@ -5,6 +5,7 @@ SUBMISSION_OPTIONS=
 AUTH_ID_DOMAIN=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3416 b/test/confs/3416
index 1888371ac..f76652f95 100644
--- a/test/confs/3416
+++ b/test/confs/3416
@@ -2,6 +2,7 @@
 # Recipient callout with AUTH
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3450 b/test/confs/3450
index 26a277a98..19e3a6b27 100644
--- a/test/confs/3450
+++ b/test/confs/3450
@@ -1,6 +1,7 @@
 # Exim test configuration 3450
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3451 b/test/confs/3451
index 052469d14..1c0a478cd 100644
--- a/test/confs/3451
+++ b/test/confs/3451
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3452 b/test/confs/3452
index 6e411f521..b36e1fa04 100644
--- a/test/confs/3452
+++ b/test/confs/3452
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3453 b/test/confs/3453
index 0a2a068a7..199db1590 100644
--- a/test/confs/3453
+++ b/test/confs/3453
@@ -3,6 +3,7 @@
 REMEMBER=false
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3454 b/test/confs/3454
index 727a71d86..b45b9183c 100644
--- a/test/confs/3454
+++ b/test/confs/3454
@@ -1,6 +1,7 @@
 # Exim test configuration 3454
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3455 b/test/confs/3455
index cf7caed4f..3d33fb650 100644
--- a/test/confs/3455
+++ b/test/confs/3455
@@ -3,6 +3,7 @@
 HOSTS_AVOID_TLS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3460 b/test/confs/3460
index 59da15cb8..84e585a5c 100644
--- a/test/confs/3460
+++ b/test/confs/3460
@@ -1,6 +1,7 @@
 # Exim test configuration 3460
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3461 b/test/confs/3461
index c93abddd7..45a28fd62 100644
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3462 b/test/confs/3462
index f21651e5e..10b6cb952 100644
--- a/test/confs/3462
+++ b/test/confs/3462
@@ -3,6 +3,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3463 b/test/confs/3463
index 1933b8a48..f6228f979 100644
--- a/test/confs/3463
+++ b/test/confs/3463
@@ -3,6 +3,7 @@
 REMEMBER=false
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3464 b/test/confs/3464
index 79f0df297..7f2d2777d 100644
--- a/test/confs/3464
+++ b/test/confs/3464
@@ -1,6 +1,7 @@
 # Exim test configuration 3464
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3465 b/test/confs/3465
index 9486f5016..1b73148cc 100644
--- a/test/confs/3465
+++ b/test/confs/3465
@@ -3,6 +3,7 @@
 HOSTS_AVOID_TLS=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3500 b/test/confs/3500
index 87e57fc88..fbcd12c9d 100644
--- a/test/confs/3500
+++ b/test/confs/3500
@@ -1,6 +1,7 @@
 # Exim test configuration 3500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3501 b/test/confs/3501
index a596e8f33..690979a2d 100644
--- a/test/confs/3501
+++ b/test/confs/3501
@@ -1,6 +1,7 @@
 # Exim test configuration 3501
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3600 b/test/confs/3600
index 3e491386b..7c6549f46 100644
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/3700 b/test/confs/3700
index 1565b5f79..667131e3f 100644
--- a/test/confs/3700
+++ b/test/confs/3700
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4000 b/test/confs/4000
index f5c2d3961..bc4ccd8fd 100644
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,6 +1,7 @@
 # Exim test configuration 4000
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4001 b/test/confs/4001
index 61ad4c927..0ab60d1a4 100644
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -2,6 +2,7 @@
 # Content-scan: f-protd interface
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4002 b/test/confs/4002
index c7d27b811..a4e7cad7c 100644
--- a/test/confs/4002
+++ b/test/confs/4002
@@ -2,6 +2,7 @@
 # Content-scan: aveserver interface
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4003 b/test/confs/4003
index 380e3a474..abfb4aef5 100644
--- a/test/confs/4003
+++ b/test/confs/4003
@@ -2,6 +2,7 @@
 # Content-scan: fsecure interface
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4004 b/test/confs/4004
index be674b502..e489ee93f 100644
--- a/test/confs/4004
+++ b/test/confs/4004
@@ -2,6 +2,7 @@
 # Content-scan: sophie interface
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4005 b/test/confs/4005
index cd715d5e6..e7da5a56d 100644
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -5,6 +5,7 @@ OPT=
 CONTROL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4006 b/test/confs/4006
index c3d2a3142..a0b74f1c1 100644
--- a/test/confs/4006
+++ b/test/confs/4006
@@ -2,6 +2,7 @@
 # Content-scan: avast interface
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4007 b/test/confs/4007
index f0792722b..df41eebf7 100644
--- a/test/confs/4007
+++ b/test/confs/4007
@@ -2,6 +2,7 @@
 # Content-scan: cmsline interface
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4008 b/test/confs/4008
index 463167503..7cba2689f 100644
--- a/test/confs/4008
+++ b/test/confs/4008
@@ -2,6 +2,7 @@
 # Content-scan: rspamd interface
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4009 b/test/confs/4009
index 8b86f7ed6..45f95edc2 100644
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -4,6 +4,7 @@
 OPT= 127.0.0.1 7833
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4010 b/test/confs/4010
index 94dc25b0f..62ef3e6ac 100644
--- a/test/confs/4010
+++ b/test/confs/4010
@@ -1,6 +1,7 @@
 # Exim test configuration 0568:  ACL regex=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
diff --git a/test/confs/4020 b/test/confs/4020
index acc447718..d37b0d8fc 100644
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -3,6 +3,7 @@
 OPT =
 
 exim_path = EXIM_PATH
+keep_environment =
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4028 b/test/confs/4028
index 3174e7543..de11185bb 100644
--- a/test/confs/4028
+++ b/test/confs/4028
@@ -5,6 +5,7 @@ OPT =
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4029 b/test/confs/4029
index ae4e71850..b8f7ec45a 100644
--- a/test/confs/4029
+++ b/test/confs/4029
@@ -5,6 +5,7 @@ OPT =
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4100 b/test/confs/4100
index b5d938321..8c101e818 100644
--- a/test/confs/4100
+++ b/test/confs/4100
@@ -1,6 +1,7 @@
 # Exim test configuration 4100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/4200 b/test/confs/4200
index 2237b5c99..f7df70b97 100644
--- a/test/confs/4200
+++ b/test/confs/4200
@@ -1,6 +1,7 @@
 # Exim test configuration 4200
 
 exim_path = EXIM_PATH
+keep_environment =
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_name = CALLER_NAME
diff --git a/test/confs/4201 b/test/confs/4201
index 980f1d8fa..298eb847d 100644
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -7,6 +7,7 @@ INSERT =
 SUB =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/4211 b/test/confs/4211
index 085fecc72..a5cc47ad1 100644
--- a/test/confs/4211
+++ b/test/confs/4211
@@ -5,6 +5,7 @@ OPTION = *
 CONTROL =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/4221 b/test/confs/4221
index 085fecc72..a5cc47ad1 100644
--- a/test/confs/4221
+++ b/test/confs/4221
@@ -5,6 +5,7 @@ OPTION = *
 CONTROL =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/4500 b/test/confs/4500
index cb98407cc..61a04f6b0 100644
--- a/test/confs/4500
+++ b/test/confs/4500
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4503 b/test/confs/4503
index ccff509da..45e6d1463 100644
--- a/test/confs/4503
+++ b/test/confs/4503
@@ -4,6 +4,7 @@ SERVER=
 OPT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/4700 b/test/confs/4700
index 6a532b6a0..5a86785dd 100644
--- a/test/confs/4700
+++ b/test/confs/4700
@@ -1,6 +1,7 @@
 # Exim test configuration 0211
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
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/4950 b/test/confs/4950
index 752b66aad..3a1868470 100644
--- a/test/confs/4950
+++ b/test/confs/4950
@@ -1,6 +1,7 @@
 # Exim test configuration 4950
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5000 b/test/confs/5000
index 2ceeb06a8..7925a61f1 100644
--- a/test/confs/5000
+++ b/test/confs/5000
@@ -1,6 +1,7 @@
 # Exim test configuration 5000
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5001 b/test/confs/5001
index a5475fd85..fbc9f6dc7 100644
--- a/test/confs/5001
+++ b/test/confs/5001
@@ -1,6 +1,7 @@
 # Exim test configuration 5001
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5002 b/test/confs/5002
index 021166431..924e5adf1 100644
--- a/test/confs/5002
+++ b/test/confs/5002
@@ -1,6 +1,7 @@
 # Exim test configuration 5002
 
 exim_path = EXIM_PATH
+keep_environment =
 primary_hostname = myhost.test.ex
 host_lookup_order = bydns
 spool_directory = DIR/spool
diff --git a/test/confs/5003 b/test/confs/5003
index cdfaec5da..8c2b6f551 100644
--- a/test/confs/5003
+++ b/test/confs/5003
@@ -1,6 +1,7 @@
 # Exim test configuration 5003
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5004 b/test/confs/5004
index 3596fabaf..7d4739f10 100644
--- a/test/confs/5004
+++ b/test/confs/5004
@@ -1,6 +1,7 @@
 # Exim test configuration 5004
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5005 b/test/confs/5005
index 6fa97f152..52216ce69 100644
--- a/test/confs/5005
+++ b/test/confs/5005
@@ -3,6 +3,7 @@
 QUOTA=500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5006 b/test/confs/5006
index 107d025dd..ca45d9b38 100644
--- a/test/confs/5006
+++ b/test/confs/5006
@@ -1,6 +1,7 @@
 # Exim test configuration 5006
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5007 b/test/confs/5007
index eab0c2013..435aea650 100644
--- a/test/confs/5007
+++ b/test/confs/5007
@@ -3,6 +3,7 @@
 QUOTA=500
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5008 b/test/confs/5008
index adfbecde3..3e8e55530 100644
--- a/test/confs/5008
+++ b/test/confs/5008
@@ -3,6 +3,7 @@
 QUOTA_FILECOUNT=0
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5009 b/test/confs/5009
index f5983a1cb..bc945aa9f 100644
--- a/test/confs/5009
+++ b/test/confs/5009
@@ -3,6 +3,7 @@
 SUB=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5050 b/test/confs/5050
index 6bff7fe14..a7d392ecd 100644
--- a/test/confs/5050
+++ b/test/confs/5050
@@ -1,6 +1,7 @@
 # Exim test configuration 5050
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5100 b/test/confs/5100
index 908a021a9..c3ebee170 100644
--- a/test/confs/5100
+++ b/test/confs/5100
@@ -3,6 +3,7 @@
 IGNORE_QUOTA=FALSE
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5101 b/test/confs/5101
index 5de00516c..bb33142ea 100644
--- a/test/confs/5101
+++ b/test/confs/5101
@@ -1,6 +1,7 @@
 # Exim test configuration 5101
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5102 b/test/confs/5102
index bc33185c7..b1341fd32 100644
--- a/test/confs/5102
+++ b/test/confs/5102
@@ -1,6 +1,7 @@
 # Exim test configuration 5102
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5103 b/test/confs/5103
index d9ed330fa..dfd897d55 100644
--- a/test/confs/5103
+++ b/test/confs/5103
@@ -1,6 +1,7 @@
 # Exim test configuration 5103
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5200 b/test/confs/5200
index a6f70518e..323b473e8 100644
--- a/test/confs/5200
+++ b/test/confs/5200
@@ -1,6 +1,7 @@
 # Exim test configuration 5200
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5201 b/test/confs/5201
index 4fa69d0ce..e84e2a3b7 100644
--- a/test/confs/5201
+++ b/test/confs/5201
@@ -1,6 +1,7 @@
 # Exim test configuration 5201
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5202 b/test/confs/5202
index 6f5f7e679..5fa1a7702 100644
--- a/test/confs/5202
+++ b/test/confs/5202
@@ -1,6 +1,7 @@
 # Exim test configuration 5202
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5203 b/test/confs/5203
index 99864f5fa..9d348fa7b 100644
--- a/test/confs/5203
+++ b/test/confs/5203
@@ -1,6 +1,7 @@
 # Exim test configuration 5203
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5204 b/test/confs/5204
index 2393a5778..e44645991 100644
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -3,6 +3,7 @@
 COMMAND_USER=EXIMUSER
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5205 b/test/confs/5205
index fc32d2bdb..74bab74e7 100644
--- a/test/confs/5205
+++ b/test/confs/5205
@@ -1,6 +1,7 @@
 # Exim test configuration 5205
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5206 b/test/confs/5206
index 4f9606596..3ef70a42c 100644
--- a/test/confs/5206
+++ b/test/confs/5206
@@ -1,6 +1,7 @@
 # Exim test configuration 5206
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5207 b/test/confs/5207
index 018f1fc7d..8b45d32f5 100644
--- a/test/confs/5207
+++ b/test/confs/5207
@@ -1,6 +1,7 @@
 # Exim test configuration 5207
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5208 b/test/confs/5208
index 5a6276e46..5574fed8e 100644
--- a/test/confs/5208
+++ b/test/confs/5208
@@ -4,6 +4,7 @@ LIST=
 SELF=freeze
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5209 b/test/confs/5209
index 334313bb0..c27e110ba 100644
--- a/test/confs/5209
+++ b/test/confs/5209
@@ -1,6 +1,7 @@
 # Exim test configuration 5209
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5300 b/test/confs/5300
index e68f9aaff..cda78f89e 100644
--- a/test/confs/5300
+++ b/test/confs/5300
@@ -3,6 +3,7 @@
 ALLOW=true
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5301 b/test/confs/5301
index 0579db202..5ce5eeedb 100644
--- a/test/confs/5301
+++ b/test/confs/5301
@@ -3,6 +3,7 @@
 D6=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5400 b/test/confs/5400
index 2a2d45860..2bbe6965a 100644
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -1,6 +1,7 @@
 # Exim test configuration 5400
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5401 b/test/confs/5401
index 3ee414c85..2263bc0bf 100644
--- a/test/confs/5401
+++ b/test/confs/5401
@@ -1,6 +1,7 @@
 # Exim test configuration 5401
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5410 b/test/confs/5410
index 735b52932..4c59adb95 100644
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -1,6 +1,7 @@
 # Exim test configuration 5410
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5420 b/test/confs/5420
index f8379c7bd..bb559116e 100644
--- a/test/confs/5420
+++ b/test/confs/5420
@@ -1,6 +1,7 @@
 # Exim test configuration 5420
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5500 b/test/confs/5500
index f1a088d42..df818af1f 100644
--- a/test/confs/5500
+++ b/test/confs/5500
@@ -4,6 +4,7 @@
 LOG_SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5510 b/test/confs/5510
index b3bddcd1a..41b424798 100644
--- a/test/confs/5510
+++ b/test/confs/5510
@@ -4,6 +4,7 @@
 LOG_SELECTOR=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5600 b/test/confs/5600
index 2dc1090df..c05bcfcf9 100644
--- a/test/confs/5600
+++ b/test/confs/5600
@@ -4,6 +4,7 @@
 CRL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 spool_directory = DIR/spool
diff --git a/test/confs/5601 b/test/confs/5601
index 785f0c64f..267f4e071 100644
--- a/test/confs/5601
+++ b/test/confs/5601
@@ -4,6 +4,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment  = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 spool_directory = DIR/spool
diff --git a/test/confs/5650 b/test/confs/5650
index bf4462be3..8d07b7a9c 100644
--- a/test/confs/5650
+++ b/test/confs/5650
@@ -4,6 +4,7 @@
 CRL=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 spool_directory = DIR/spool
diff --git a/test/confs/5651 b/test/confs/5651
index cffa4107c..fe9d3bceb 100644
--- a/test/confs/5651
+++ b/test/confs/5651
@@ -4,6 +4,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 spool_directory = DIR/spool
diff --git a/test/confs/5700 b/test/confs/5700
index db1aa2a6e..613ebef44 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -1,6 +1,7 @@
 # Exim test configuration 5700
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/5710 b/test/confs/5710
index 354d3935b..47c8e7c50 100644
--- a/test/confs/5710
+++ b/test/confs/5710
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5720 b/test/confs/5720
index e2ef60bdd..ca0b19744 100644
--- a/test/confs/5720
+++ b/test/confs/5720
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5730 b/test/confs/5730
index 7ed8ad4b7..8a5b0751c 100644
--- a/test/confs/5730
+++ b/test/confs/5730
@@ -4,6 +4,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 spool_directory = DIR/spool
diff --git a/test/confs/5740 b/test/confs/5740
index e20a8b601..4c6345a8a 100644
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -4,6 +4,7 @@
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 spool_directory = DIR/spool
diff --git a/test/confs/5800 b/test/confs/5800
index 6d1b1ac52..af03ee53a 100644
--- a/test/confs/5800
+++ b/test/confs/5800
@@ -2,6 +2,7 @@
 # DANE common
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5820 b/test/confs/5820
index 1b487026f..9ee830910 100644
--- a/test/confs/5820
+++ b/test/confs/5820
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5840 b/test/confs/5840
index 4f468a384..e83919005 100644
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/5860 b/test/confs/5860
index d3f6db3c4..eae2edb0d 100644
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9000 b/test/confs/9000
index 05512bb0d..9e9d2b006 100644
--- a/test/confs/9000
+++ b/test/confs/9000
@@ -3,6 +3,7 @@
 LDAPSERVERS=
 
 exim_path = EXIM_PATH
+keep_environment = LDAPTLS_REQCERT
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9001 b/test/confs/9001
index 6817dbeb5..cd474796f 100644
--- a/test/confs/9001
+++ b/test/confs/9001
@@ -1,6 +1,7 @@
 # Exim test configuration 9001
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9100 b/test/confs/9100
index e674784ce..a633b2879 100644
--- a/test/confs/9100
+++ b/test/confs/9100
@@ -1,6 +1,7 @@
 # Exim test configuration 9100
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9200 b/test/confs/9200
index ee4e41030..f934e5133 100644
--- a/test/confs/9200
+++ b/test/confs/9200
@@ -3,6 +3,7 @@
 SERVERS=localhost/test/ph10/
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9300 b/test/confs/9300
index de32e9bc7..45fb6a8de 100644
--- a/test/confs/9300
+++ b/test/confs/9300
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9350 b/test/confs/9350
index e312ee609..f3baf2bbe 100644
--- a/test/confs/9350
+++ b/test/confs/9350
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9400 b/test/confs/9400
index 855227b31..0317e853a 100644
--- a/test/confs/9400
+++ b/test/confs/9400
@@ -1,6 +1,7 @@
 # Exim test configuration 9400
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9401 b/test/confs/9401
index b69c844de..efa6af29a 100644
--- a/test/confs/9401
+++ b/test/confs/9401
@@ -1,6 +1,7 @@
 # Exim test configuration 9401
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/9402 b/test/confs/9402
index 7e455d146..b1aa065da 100644
--- a/test/confs/9402
+++ b/test/confs/9402
@@ -3,6 +3,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9450 b/test/confs/9450
index 4e2464f4c..91e0630d3 100644
--- a/test/confs/9450
+++ b/test/confs/9450
@@ -1,6 +1,7 @@
 # Exim test configuration 9450
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9900 b/test/confs/9900
index 7537ebd63..2f55484a7 100644
--- a/test/confs/9900
+++ b/test/confs/9900
@@ -1,6 +1,7 @@
 # Exim test configuration 9900
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/9901 b/test/confs/9901
index f4c569ff1..3584b71e3 100644
--- a/test/confs/9901
+++ b/test/confs/9901
@@ -4,6 +4,7 @@ COM=
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
diff --git a/test/confs/9902 b/test/confs/9902
index cabbfd5ec..95752ec35 100644
--- a/test/confs/9902
+++ b/test/confs/9902
@@ -5,6 +5,7 @@
 ORDER=
 
 exim_path = EXIM_PATH
+keep_environment =
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/confs/9903 b/test/confs/9903
index d2f0fcb85..200ce25b3 100644
--- a/test/confs/9903
+++ b/test/confs/9903
@@ -1,6 +1,7 @@
 # Exim test configuration 9903
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
diff --git a/test/paniclog/0013 b/test/paniclog/0013
index 78e7e579a..74c607a1b 100644
--- a/test/paniclog/0013
+++ b/test/paniclog/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
   extra characters follow string value for relay_hosts
diff --git a/test/paniclog/0148 b/test/paniclog/0148
index bf2bfc0b3..d9985aabd 100644
--- a/test/paniclog/0148
+++ b/test/paniclog/0148
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 17 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
   missing quote at end of string value for hold_domains
diff --git a/test/paniclog/0236 b/test/paniclog/0236
index 66533fed4..6b472bcd8 100644
--- a/test/paniclog/0236
+++ b/test/paniclog/0236
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
   macro name too long (maximum is 63 characters)
diff --git a/test/paniclog/0290 b/test/paniclog/0290
index 24b6854cc..40585c690 100644
--- a/test/paniclog/0290
+++ b/test/paniclog/0290
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 27 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 28 of TESTSUITE/test-config:
   .include specifies a non-absolute path "non/absolute"
diff --git a/test/paniclog/0348 b/test/paniclog/0348
index d2c59c2ad..d18082f4c 100644
--- a/test/paniclog/0348
+++ b/test/paniclog/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
diff --git a/test/paniclog/0415 b/test/paniclog/0415
index bedff5d78..4e5fcc9c6 100644
--- a/test/paniclog/0415
+++ b/test/paniclog/0415
@@ -1,20 +1,20 @@
-1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
   absolute value of integer "4000000M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
-  extra characters follow integer value for check_spool_space
 1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+  extra characters follow integer value for check_spool_space
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
   integer "4000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999999999999999" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999999K" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   integer expected for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
diff --git a/test/paniclog/0442 b/test/paniclog/0442
index 6db126e5a..f8afd85ea 100644
--- a/test/paniclog/0442
+++ b/test/paniclog/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config:
   failed to open included configuration file /non/existent
diff --git a/test/runtest b/test/runtest
index 8dcb0587c..18ed0915d 100755
--- a/test/runtest
+++ b/test/runtest
@@ -349,7 +349,7 @@ $spid = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
 # that are specific to certain file types, though there are also some of those
 # inline too.
 
-while(<IN>)
+LINE: while(<IN>)
   {
 RESET_AFTER_EXTRA_LINE_READ:
   # Custom munges
@@ -564,6 +564,25 @@ RESET_AFTER_EXTRA_LINE_READ:
   # signature algorithm names
   s/RSA-SHA1/RSA-SHA/;
 
+  # -d produces a list of environement variables as they are checked if they exist in the
+  # in the environment. Unfortunately this list isn't always in the same order. For now we
+  # just remove this list
+  #
+  if (/^\w+ in keep_environment/)
+    {
+    my @lines = $_;
+    while (<IN>)
+      {
+      if (/^\w+ in keep_environment/)
+        {
+        push @lines, $_;
+        next;
+        }
+      print MUNGED sort grep { !/^(SHLVL|_) / } @lines;
+      redo LINE;
+      }
+    }
+
 
   # ======== Caller's login, uid, gid, home, gecos ========
 
@@ -1686,6 +1705,8 @@ my($commandnameref) = $_[3];
 my($aux_info) = $_[4];
 my($yield) = 1;
 
+our %ENV = map { $_ => $ENV{$_} } grep { /^(?:USER|SHELL|PATH|TERM|EXIM_TEST_.*)$/ } keys %ENV;
+
 if (/^(\d+)\s*$/)                # Handle unusual return code
   {
   my($r) = $_[2];
@@ -2089,7 +2110,7 @@ if (/^client/ || /^(sudo\s+)?perl\b/)
 # not drop privilege when -C and -D options are present. To run the exim
 # command as root, we use sudo.
 
-elsif (/^([A-Z_]+=\S+\s+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+)?\s+(.*)$/)
+elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+)?\s+(.*)$/)
   {
   $args = $6;
   my($envset) = (defined $1)? $1      : "";
diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615
new file mode 100644
index 000000000..9057363f3
--- /dev/null
+++ b/test/scripts/0000-Basic/0615
@@ -0,0 +1,13 @@
+# Environment
+# settings
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP keep_environment add_environment
+****
+# result via -bP enviroment
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP environment
+****
+# result via -n -bP enviroment
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -n -bP environment
+****
+# result via perl_at_start
+FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -ps -be ''
+***
diff --git a/test/scripts/0000-Basic/0616 b/test/scripts/0000-Basic/0616
new file mode 120000
index 000000000..122707d0a
--- /dev/null
+++ b/test/scripts/0000-Basic/0616
@@ -0,0 +1 @@
+0615
\ No newline at end of file
diff --git a/test/stderr/0002 b/test/stderr/0002
index b4f06a104..c19ce9ce3 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -130,6 +130,11 @@ expanding: -oMt  sender_ident = $sender_ident
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+PATH in keep_environment? no (end of list)
+PWD in keep_environment? no (end of list)
+SHELL in keep_environment? no (end of list)
+TERM in keep_environment? no (end of list)
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -189,6 +194,11 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+PATH in keep_environment? no (end of list)
+PWD in keep_environment? no (end of list)
+SHELL in keep_environment? no (end of list)
+TERM in keep_environment? no (end of list)
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -373,6 +383,11 @@ LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=pppp
+PATH in keep_environment? no (end of list)
+PWD in keep_environment? no (end of list)
+SHELL in keep_environment? no (end of list)
+TERM in keep_environment? no (end of list)
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git a/test/stderr/0013 b/test/stderr/0013
index 78e7e579a..74c607a1b 100644
--- a/test/stderr/0013
+++ b/test/stderr/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
   extra characters follow string value for relay_hosts
diff --git a/test/stderr/0148 b/test/stderr/0148
index 1b5b73a21..f7153995d 100644
--- a/test/stderr/0148
+++ b/test/stderr/0148
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 17 of TESTSUITE/test-config:
+  Exim configuration error in line 18 of TESTSUITE/test-config:
   missing quote at end of string value for hold_domains
diff --git a/test/stderr/0236 b/test/stderr/0236
index 193370cc8..75ed334bf 100644
--- a/test/stderr/0236
+++ b/test/stderr/0236
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 15 of TESTSUITE/test-config:
+  Exim configuration error in line 16 of TESTSUITE/test-config:
   macro name too long (maximum is 63 characters)
diff --git a/test/stderr/0290 b/test/stderr/0290
index cd1712e9f..729780b71 100644
--- a/test/stderr/0290
+++ b/test/stderr/0290
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 27 of TESTSUITE/test-config:
+  Exim configuration error in line 28 of TESTSUITE/test-config:
   .include specifies a non-absolute path "non/absolute"
diff --git a/test/stderr/0348 b/test/stderr/0348
index d2c59c2ad..d18082f4c 100644
--- a/test/stderr/0348
+++ b/test/stderr/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
   bad parameters for retry rule
diff --git a/test/stderr/0415 b/test/stderr/0415
index 062b67be5..95b5e7f5e 100644
--- a/test/stderr/0415
+++ b/test/stderr/0415
@@ -1,30 +1,30 @@
 LOG: PANIC DIE
-  Exim configuration error in line 20 of TESTSUITE/test-config:
+  Exim configuration error in line 21 of TESTSUITE/test-config:
   absolute value of integer "4000000M" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 20 of TESTSUITE/test-config:
+  Exim configuration error in line 21 of TESTSUITE/test-config:
   extra characters follow integer value for check_spool_space
 LOG: PANIC DIE
-  Exim configuration error in line 21 of TESTSUITE/test-config:
+  Exim configuration error in line 22 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 21 of TESTSUITE/test-config:
+  Exim configuration error in line 22 of TESTSUITE/test-config:
   integer "4000000.123" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999999999999999" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999999K" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   absolute value of integer "999999M" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   integer expected for finduser_retries
 LOG: PANIC DIE
-  Exim configuration error in line 23 of TESTSUITE/test-config:
+  Exim configuration error in line 24 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
diff --git a/test/stderr/0442 b/test/stderr/0442
index 6db126e5a..f8afd85ea 100644
--- a/test/stderr/0442
+++ b/test/stderr/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config:
   failed to open included configuration file /non/existent
diff --git a/test/stderr/0615 b/test/stderr/0615
new file mode 100644
index 000000000..85ee6f760
--- /dev/null
+++ b/test/stderr/0615
@@ -0,0 +1,15 @@
+LOG: MAIN
+  WARNING: purging the environment.
+ Suggested action: use keep_environment and add_environment.
+
+LOG: MAIN
+  WARNING: purging the environment.
+ Suggested action: use keep_environment and add_environment.
+
+LOG: MAIN
+  WARNING: purging the environment.
+ Suggested action: use keep_environment and add_environment.
+
+1999-03-02 09:44:33 WARNING: purging the environment.
+ Suggested action: use keep_environment and add_environment.
+
diff --git a/test/stdout/0572 b/test/stdout/0572
index 40397afa5..3a026977c 100644
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -73,6 +73,7 @@ size_addition = 1024
 # 1 "TESTSUITE/test-config"
 OPT =
 exim_path = TESTSUITE/eximdir/exim
+keep_environment =
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = TESTSUITE/spool
diff --git a/test/stdout/0615 b/test/stdout/0615
new file mode 100644
index 000000000..58d5d0e37
--- /dev/null
+++ b/test/stdout/0615
@@ -0,0 +1,4 @@
+keep_environment = 
+add_environment = 
+Environment visible in Perl:
+
diff --git a/test/stdout/0616 b/test/stdout/0616
new file mode 100644
index 000000000..8ba67bb34
--- /dev/null
+++ b/test/stdout/0616
@@ -0,0 +1,19 @@
+keep_environment = ^FOO\d : BAR
+add_environment = ADDED1=added1 : ADDED2=added2
+ADDED1=added1
+ADDED2=added2
+BAR=bar
+FOO1=foo1
+FOO2=foo2
+ADDED1
+ADDED2
+BAR
+FOO1
+FOO2
+Environment visible in Perl:
+ADDED1=added1
+ADDED2=added2
+BAR=bar
+FOO1=foo1
+FOO2=foo2
+
-- 
2.30.2