diff --git a/tests/data/test1375 b/tests/data/test1375
index 9af026ba2e..a02a616732 100644
--- a/tests/data/test1375
+++ b/tests/data/test1375
@@ -8,15 +8,15 @@ HTTP GET
 
 #
 <reply>
-<data nocheck="yes">
-HTTP/1.1 200 OK%CR
-Date: Tue, 09 Nov 2010 14:49:00 GMT%CR
-Server: test-server/fake%CR
-Content-Length: 6%CR
-Connection: close%CR
-Content-Type: text/html%CR
-Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange%CR
-%CR
+<data crlf="headers" nocheck="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
 12345
 </data>
 </reply>
diff --git a/tests/data/test1376 b/tests/data/test1376
index d673bd7353..379dee3018 100644
--- a/tests/data/test1376
+++ b/tests/data/test1376
@@ -8,14 +8,14 @@ HTTP GET
 
 #
 <reply>
-<data nocheck="yes">
-HTTP/1.1 200 OK%CR
-Date: Tue, 09 Nov 2010 14:49:00 GMT%CR
-Server: test-server/fake%CR
-Content-Length: 6%CR
-Connection: close%CR
-Content-Type: text/html%CR
-%CR
+<data crlf="headers" nocheck="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+
 12345
 </data>
 </reply>
diff --git a/tests/data/test1377 b/tests/data/test1377
index c2ade403d2..7a8234891d 100644
--- a/tests/data/test1377
+++ b/tests/data/test1377
@@ -8,15 +8,15 @@ HTTP GET
 
 #
 <reply>
-<data nocheck="yes">
-HTTP/1.1 200 OK%CR
-Date: Tue, 09 Nov 2010 14:49:00 GMT%CR
-Server: test-server/fake%CR
-Content-Length: 6%CR
-Connection: close%CR
-Content-Type: text/html%CR
-Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange%CR
-%CR
+<data crlf="headers" nocheck="yes">
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
 12345
 </data>
 </reply>
diff --git a/tests/data/test1429 b/tests/data/test1429
index b9c6bd126d..f08c0dae2a 100644
--- a/tests/data/test1429
+++ b/tests/data/test1429
@@ -8,18 +8,18 @@ HTTP/0.9
 </info>
 
 <reply>
-<data nocheck="yes">
-HTTP/1.1 999 OK%CR
-Date: Tue, 09 Nov 2010 14:49:00 GMT%CR
-Server: test-server/fake%CR
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT%CR
-ETag: "21025-dc7-39462498"%CR
-Accept-Ranges: bytes%CR
-Content-Length: 6%CR
-Connection: close%CR
-Content-Type: text/html%CR
-Funny-head: yesyes%CR
-%CR
+<data crlf="headers" nocheck="yes">
+HTTP/1.1 999 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
 -foo-
 </data>
 </reply>
diff --git a/tests/data/test433 b/tests/data/test433
index c6c77d90bb..63c884fdbe 100644
--- a/tests/data/test433
+++ b/tests/data/test433
@@ -8,11 +8,11 @@
 #
 # Server-side
 <reply>
-<data>
-HTTP/1.1 200 OK%CR
-Content-Length: 6%CR
-Content-Type: text/1%CR
-%CR
+<data crlf="headers">
+HTTP/1.1 200 OK
+Content-Length: 6
+Content-Type: text/1
+
 -foo-
 </data>
 </reply>