diff --git a/tests/data/test1034 b/tests/data/test1034
index 968c96d250..eda13bb23e 100644
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -30,7 +30,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 HTTP over proxy with malformatted IDN host name
diff --git a/tests/data/test1035 b/tests/data/test1035
index bdd85256d2..c8eb282aff 100644
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -28,7 +28,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 HTTP over proxy with too long IDN host name
diff --git a/tests/data/test1448 b/tests/data/test1448
index 0b57af2e27..f7ff09f952 100644
--- a/tests/data/test1448
+++ b/tests/data/test1448
@@ -44,7 +44,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 Redirect following to UTF-8 IDN host name
diff --git a/tests/data/test1560 b/tests/data/test1560
index 92b08cdeda..ce8c7c42a7 100644
--- a/tests/data/test1560
+++ b/tests/data/test1560
@@ -14,7 +14,6 @@ none
 </server>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <features>
 file
diff --git a/tests/data/test165 b/tests/data/test165
index 7a61f10aad..4996a3564f 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -34,7 +34,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 HTTP over proxy with IDN host name
diff --git a/tests/data/test2046 b/tests/data/test2046
index 85c48e9183..555515aa4a 100644
--- a/tests/data/test2046
+++ b/tests/data/test2046
@@ -44,7 +44,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 Connection reuse with IDN host name
diff --git a/tests/data/test2047 b/tests/data/test2047
index fdc3fcc9f1..9c671b1785 100644
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -45,7 +45,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 Connection reuse with IDN host name over HTTP proxy
diff --git a/tests/data/test955 b/tests/data/test955
index db4db3a8c2..633c2e369d 100644
--- a/tests/data/test955
+++ b/tests/data/test955
@@ -25,7 +25,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP without SMTPUTF8 support - UTF-8 based sender (local part only)
diff --git a/tests/data/test956 b/tests/data/test956
index 14c37e7683..9472e96e15 100644
--- a/tests/data/test956
+++ b/tests/data/test956
@@ -22,7 +22,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP without SMTPUTF8 support - UTF-8 based recipient (local part only)
diff --git a/tests/data/test957 b/tests/data/test957
index 3edb850a8b..671d73bbf2 100644
--- a/tests/data/test957
+++ b/tests/data/test957
@@ -23,7 +23,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP VRFY without SMTPUTF8 support - UTF-8 recipient (local part only)
diff --git a/tests/data/test958 b/tests/data/test958
index 71a74b2527..203254bfc2 100644
--- a/tests/data/test958
+++ b/tests/data/test958
@@ -23,7 +23,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP external VRFY without SMTPUTF8 - UTF-8 recipient (local part only)
diff --git a/tests/data/test959 b/tests/data/test959
index e80dcc1cc9..5693e34944 100644
--- a/tests/data/test959
+++ b/tests/data/test959
@@ -26,7 +26,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP without SMTPUTF8 support - UTF-8 based sender (host part only)
diff --git a/tests/data/test960 b/tests/data/test960
index ec486ac0ad..ced2ba0b54 100644
--- a/tests/data/test960
+++ b/tests/data/test960
@@ -23,7 +23,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP without SMTPUTF8 support - UTF-8 based recipient (host part only)
diff --git a/tests/data/test961 b/tests/data/test961
index ceb3a4f764..c52d5df344 100644
--- a/tests/data/test961
+++ b/tests/data/test961
@@ -24,7 +24,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP external VRFY without SMTPUTF8 - UTF-8 recipient (host part only)
diff --git a/tests/data/test963 b/tests/data/test963
index de34e58fea..bce626c5e3 100644
--- a/tests/data/test963
+++ b/tests/data/test963
@@ -24,7 +24,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP without SMTPUTF8 support (IDN) - UTF-8 recipient (host part only)
diff --git a/tests/data/test964 b/tests/data/test964
index 08c499b4e4..04e5b1c152 100644
--- a/tests/data/test964
+++ b/tests/data/test964
@@ -25,7 +25,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP external VRFY without SMTPUTF8 (IDN) - UTF-8 recipient (host part)
diff --git a/tests/data/test965 b/tests/data/test965
index af86a41ac0..601db62fe0 100644
--- a/tests/data/test965
+++ b/tests/data/test965
@@ -27,7 +27,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP with SMTPUTF8 support - UTF-8 based sender
diff --git a/tests/data/test966 b/tests/data/test966
index d44ddf8476..646e807589 100644
--- a/tests/data/test966
+++ b/tests/data/test966
@@ -27,7 +27,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP with SMTPUTF8 support - UTF-8 based recipient
diff --git a/tests/data/test967 b/tests/data/test967
index 0d422a28e6..7cacbcbdd2 100644
--- a/tests/data/test967
+++ b/tests/data/test967
@@ -31,7 +31,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP external VRFY with SMTPUTF8 support
diff --git a/tests/data/test968 b/tests/data/test968
index c684113d29..4df600483b 100644
--- a/tests/data/test968
+++ b/tests/data/test968
@@ -28,7 +28,6 @@ codeset-utf8
 </features>
 <setenv>
 LC_ALL=C.UTF-8
-PLACEHOLDER2
 </setenv>
 <name>
 SMTP VRFY with SMTPUTF8 support