diff -ru curl/tests/data/test500 Test/tests/data/test500
--- curl/tests/data/test500	Thu May 12 07:22:28 2005
+++ Test/tests/data/test500	Fri Jun  3 10:07:00 2005
@@ -1,7 +1,7 @@
 #
 # Server-side
 <reply name="1">
-<data>
+<data mode="text">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff -ru curl/tests/data/test502 Test/tests/data/test502
--- curl/tests/data/test502	Sat Jul 19 23:57:08 2003
+++ Test/tests/data/test502	Fri Jun  3 10:22:06 2005
@@ -1,7 +1,7 @@
 #
 # Server-side
 <reply>
-<data>
+<data mode="text">
 foo
    bar swsclose
 bar
diff -ru curl/tests/data/test506 Test/tests/data/test506
--- curl/tests/data/test506	Fri Feb 18 10:26:44 2005
+++ Test/tests/data/test506	Fri Jun  3 10:26:16 2005
@@ -35,7 +35,7 @@
 Content-Length: 32
 
 run 3: overwrite cookie 1 and 4
-</data5>
+</data3>
 </reply>
 
 # Client-side
@@ -56,7 +56,7 @@
 
 # Verify data after the test has been "shot"
 <verify>
-<stdout>
+<stdout mode="text">
 GLOBAL_INIT
 SHARE_INIT
 CURL_LOCK_DATA_COOKIE
@@ -145,7 +145,7 @@
 <stderr>
 http://%HOSTIP:%HTTPPORT/506 
 </stderr>
-<file name="log/jar506">
+<file name="log/jar506" mode="text">
 # Netscape HTTP Cookie File
 # http://www.netscape.com/newsref/std/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
diff -ru curl/tests/data/test508 Test/tests/data/test508
--- curl/tests/data/test508	Thu May 12 07:22:28 2005
+++ Test/tests/data/test508	Fri Jun  3 10:27:16 2005
@@ -1,7 +1,7 @@
 #
 # Server-side
 <reply>
-<data>
+<data mode="text">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
diff -ru curl/tests/data/test510 Test/tests/data/test510
--- curl/tests/data/test510	Thu May 12 07:22:28 2005
+++ Test/tests/data/test510	Fri Jun  3 10:28:24 2005
@@ -1,7 +1,7 @@
 #
 # Server-side
 <reply>
-<data>
+<data mode="text">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
diff -ru curl/tests/data/test512 Test/tests/data/test512
--- curl/tests/data/test512	Thu May 12 07:22:28 2005
+++ Test/tests/data/test512	Fri Jun  3 10:29:26 2005
@@ -1,7 +1,7 @@
 #
 # Server-side
 <reply>
-<data>
+<data mode="text">
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: yes
diff -ru curl/tests/data/test514 Test/tests/data/test514
--- curl/tests/data/test514	Thu May 12 07:22:28 2005
+++ Test/tests/data/test514	Fri Jun  3 10:30:24 2005
@@ -1,7 +1,7 @@
 #
 # Server-side
 <reply>
-<data>
+<data mode="text">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff -ru curl/tests/data/test515 Test/tests/data/test515
--- curl/tests/data/test515	Thu May 12 07:22:28 2005
+++ Test/tests/data/test515	Fri Jun  3 10:31:20 2005
@@ -1,7 +1,7 @@
 #
 # Server-side
 <reply>
-<data>
+<data mode="text">
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff -ru curl/tests/data/test516 Test/tests/data/test516
--- curl/tests/data/test516	Thu May 12 07:22:28 2005
+++ Test/tests/data/test516	Fri Jun  3 10:32:48 2005
@@ -1,7 +1,7 @@
 #
 # Server-side
 <reply>
-<data>
+<data mode="text">
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff -ru curl/tests/data/test519 Test/tests/data/test519
--- curl/tests/data/test519	Thu May 12 07:22:28 2005
+++ Test/tests/data/test519	Fri Jun  3 10:34:04 2005
@@ -1,7 +1,7 @@
 #
 # Server-side
 <reply>
-<data>
+<data mode="text">
 HTTP/1.1 200 OK swsbounce
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff -ru curl/tests/data/test522 Test/tests/data/test522
--- curl/tests/data/test522	Thu May 12 07:22:28 2005
+++ Test/tests/data/test522	Fri Jun  3 10:35:08 2005
@@ -52,7 +52,7 @@
 Accept: */*
 
 </protocol>
-<stdout>
+<stdout mode="text">
 hello
 </stdout>
 </verify>
diff -ru curl/tests/runtests.pl Test/tests/runtests.pl
--- curl/tests/runtests.pl	Fri May 27 09:24:24 2005
+++ Test/tests/runtests.pl	Fri Jun  3 10:34:28 2005
@@ -1366,6 +1365,14 @@
     if(!$replyattr{'nocheck'} && (@reply || $replyattr{'sendzero'})) {
         # verify the received data
         my @out = loadarray($CURLOUT);
+        my %hash = getpartattr("reply", "data");
+        # get the mode attribute
+        my $filemode=$hash{'mode'};
+        if(($filemode eq "text") && $has_textaware) {
+            # text mode when running on windows: fix line endings
+            map s/\r\n/\n/g, @out;
+        }
+
         $res = compare("data", \@out, \@reply);
         if ($res) {
             return 1;