diff --git a/testing/normalise_result b/testing/normalise_result
index afea7fcc..08802efa 100755
--- a/testing/normalise_result
+++ b/testing/normalise_result
@@ -6,6 +6,7 @@
 #
 
 use strict;
+my $no_content = 0;
 
 while( <STDIN> ) {
 
@@ -47,5 +48,12 @@ while( <STDIN> ) {
   # Fix up any opaquelocktokens to something regular
   s/opaquelocktoken:[[:xdigit:]]{8}-([[:xdigit:]]{4}-){3}[[:xdigit:]]{12}/opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/;
 
+  /^HTTP\/1\.1 204 No Content/ && do {
+    $no_content = 1;
+  };
+  /^Content-Length: 0/ && $no_content && do {
+    $_ = "";
+  };
+
   print;
 }
diff --git a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result
index 9e166f48..88dc8add 100644
--- a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result
+++ b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result
@@ -3,7 +3,6 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
 ETag: "6cff373f55c3e8318ad1c0db93205d08"
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/regression-suite/0014-Mulberry-PUT-3.result b/testing/tests/regression-suite/0014-Mulberry-PUT-3.result
index 706dd248..d5ca460f 100644
--- a/testing/tests/regression-suite/0014-Mulberry-PUT-3.result
+++ b/testing/tests/regression-suite/0014-Mulberry-PUT-3.result
@@ -3,6 +3,5 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
 ETag: "2c32a2f8aba853654eb17fe037a4db4d"
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result
index e01a407b..0b87ec3b 100644
--- a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result
+++ b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result
index e01a407b..0b87ec3b 100644
--- a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result
+++ b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/regression-suite/0206-Moz-PUT-1.test b/testing/tests/regression-suite/0206-Moz-PUT-1.test
index 5c9a614b..0d6b587a 100644
--- a/testing/tests/regression-suite/0206-Moz-PUT-1.test
+++ b/testing/tests/regression-suite/0206-Moz-PUT-1.test
@@ -2,7 +2,7 @@
 # PUT a recurring event that we can check we can/can't see at appropriate dates
 #
 TYPE=PUT
-URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics HTTP/1.1
+URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20101108 Calendar/0.4a1
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0306-Chandler-DELETE-1.result b/testing/tests/regression-suite/0306-Chandler-DELETE-1.result
index 99119ed1..4da9d7a3 100644
--- a/testing/tests/regression-suite/0306-Chandler-DELETE-1.result
+++ b/testing/tests/regression-suite/0306-Chandler-DELETE-1.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/regression-suite/0506-iCal-PUT.result b/testing/tests/regression-suite/0506-iCal-PUT.result
index 1626aae0..78e124d7 100644
--- a/testing/tests/regression-suite/0506-iCal-PUT.result
+++ b/testing/tests/regression-suite/0506-iCal-PUT.result
@@ -3,7 +3,6 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
 ETag: "efd0257efbc898d059c200d1391af060"
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/regression-suite/0513-iCal-PUT.result b/testing/tests/regression-suite/0513-iCal-PUT.result
index 266fe7d5..cb1a01ff 100644
--- a/testing/tests/regression-suite/0513-iCal-PUT.result
+++ b/testing/tests/regression-suite/0513-iCal-PUT.result
@@ -3,7 +3,6 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
 ETag: "6079c141bc189326bf2432a8426c4242"
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result
index e01a407b..0b87ec3b 100644
--- a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result
index 481772dc..be66c37b 100644
--- a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result
@@ -2,6 +2,5 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result
index 481772dc..be66c37b 100644
--- a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result
@@ -2,6 +2,5 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result
index 481772dc..be66c37b 100644
--- a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result
@@ -2,6 +2,5 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/0955-DELTICKET.result b/testing/tests/regression-suite/0955-DELTICKET.result
index de287ba7..4a755643 100644
--- a/testing/tests/regression-suite/0955-DELTICKET.result
+++ b/testing/tests/regression-suite/0955-DELTICKET.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 0
 Content-Type: text/plain; charset="utf-8"