diff --git a/tests/data/test1016 b/tests/data/test1016
index 452d11c8a0..fac0ab6797 100644
--- a/tests/data/test1016
+++ b/tests/data/test1016
@@ -7,8 +7,6 @@ Range
 </info>
 
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test1017 b/tests/data/test1017
index ceb32f20e8..aa14533710 100644
--- a/tests/data/test1017
+++ b/tests/data/test1017
@@ -8,8 +8,6 @@ Range
 
 # Server-side
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test1018 b/tests/data/test1018
index 210f1d386f..7aff1a9db5 100644
--- a/tests/data/test1018
+++ b/tests/data/test1018
@@ -7,8 +7,6 @@ Range
 </info>
 
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test1019 b/tests/data/test1019
index 73d6cb0616..381aa7b272 100644
--- a/tests/data/test1019
+++ b/tests/data/test1019
@@ -8,8 +8,6 @@ Range
 
 # Server-side
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test1020 b/tests/data/test1020
index c2cd7f2d23..b0c8c6b409 100644
--- a/tests/data/test1020
+++ b/tests/data/test1020
@@ -8,8 +8,6 @@ Range
 
 # Server-side
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test1063 b/tests/data/test1063
index 449263ef6f..d85c014f1c 100644
--- a/tests/data/test1063
+++ b/tests/data/test1063
@@ -9,8 +9,6 @@ FAILURE
 
 # Server-side
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test1281 b/tests/data/test1281
index a0bca73eab..c7520608a3 100644
--- a/tests/data/test1281
+++ b/tests/data/test1281
@@ -8,8 +8,6 @@ URL
 #
 # Server-side
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test1291 b/tests/data/test1291
index 30ea21ac85..794ed22d02 100644
--- a/tests/data/test1291
+++ b/tests/data/test1291
@@ -11,8 +11,6 @@ HTTP PUT
 #
 # Server-side
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test1474 b/tests/data/test1474
index c66fa28104..8fc39e0e60 100644
--- a/tests/data/test1474
+++ b/tests/data/test1474
@@ -10,8 +10,6 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data>
-</data>
 </reply>
 
 #
diff --git a/tests/data/test19 b/tests/data/test19
index cf735a42f3..659088831c 100644
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -8,8 +8,6 @@ FAILURE
 </info>
 # Server-side
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test20 b/tests/data/test20
index 2384488067..31bdd71801 100644
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -9,8 +9,6 @@ non-existing host
 
 # Server-side
 <reply>
-<data>
-</data>
 </reply>
 
 # Client-side
diff --git a/tests/data/test2205 b/tests/data/test2205
index da6f1ddafa..1ab35019d9 100644
--- a/tests/data/test2205
+++ b/tests/data/test2205
@@ -36,13 +36,6 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -K %LOGDIR/input%TESTNUMBER
 #
 # Verify data after the test has been "shot"
 <verify>
-# These are hexadecimal protocol dumps from the client
-#
-# Strip out the random part of the client id from the CONNECT message
-# before comparison
-<strippart>
-s/^(.* 00044d51545404c2003c000c6375726c).*/$1/
-</strippart>
 # 8 is CURLE_WEIRD_SERVER_REPLY
 <errorcode>
 8
diff --git a/tests/data/test247 b/tests/data/test247
index ec28ca81f8..db11c93b29 100644
--- a/tests/data/test247
+++ b/tests/data/test247
@@ -38,8 +38,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005
 <strip>
 QUIT
 </strip>
-<upload>
-</upload>
 <protocol>
 USER anonymous
 PASS ftp@example.com