diff --git a/testing/normalise_result b/testing/normalise_result
index 08802efa..e7addb39 100755
--- a/testing/normalise_result
+++ b/testing/normalise_result
@@ -54,6 +54,9 @@ while( <STDIN> ) {
   /^Content-Length: 0/ && $no_content && do {
     $_ = "";
   };
+  /^Content-Type: / && $no_content && do {
+    $_ = "";
+  };
 
   print;
 }
diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result
index 3dc98ff7..8920a837 100644
--- a/testing/tests/binding/1034-DELETE-admin-bind.result
+++ b/testing/tests/binding/1034-DELETE-admin-bind.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-Type: text/plain; charset="utf-8"
 
 
           bind_id: >1607<
diff --git a/testing/tests/carddav/2014-PUT-vcard.result b/testing/tests/carddav/2014-PUT-vcard.result
index f63c28ff..8d0f4a00 100644
--- a/testing/tests/carddav/2014-PUT-vcard.result
+++ b/testing/tests/carddav/2014-PUT-vcard.result
@@ -4,7 +4,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-Type: text/plain; charset="utf-8"
 
 
         caladruri: >NULL<
diff --git a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.result
index 88dc8add..8f1d74dd 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-Type: text/plain; charset="utf-8"
 
 
    A1 CalDAV DATA: >BEGIN:VCALENDAR
diff --git a/testing/tests/regression-suite/0014-Mulberry-PUT-3.result b/testing/tests/regression-suite/0014-Mulberry-PUT-3.result
index d5ca460f..402ca7c5 100644
--- a/testing/tests/regression-suite/0014-Mulberry-PUT-3.result
+++ b/testing/tests/regression-suite/0014-Mulberry-PUT-3.result
@@ -3,5 +3,4 @@ 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-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 0b87ec3b..ce0c451c 100644
--- a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.result
+++ b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.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-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 0b87ec3b..ce0c451c 100644
--- a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.result
+++ b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.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-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/regression-suite/0306-Chandler-DELETE-1.result b/testing/tests/regression-suite/0306-Chandler-DELETE-1.result
index 4da9d7a3..1a57f898 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-Type: text/plain; charset="utf-8"
 
 
          ?column?: >Count of matching calendars (should be 0)<
diff --git a/testing/tests/regression-suite/0506-iCal-PUT.result b/testing/tests/regression-suite/0506-iCal-PUT.result
index 78e124d7..b8dd8708 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-Type: text/plain; charset="utf-8"
 
 
       CalDAV Data: >BEGIN:VCALENDAR
diff --git a/testing/tests/regression-suite/0513-iCal-PUT.result b/testing/tests/regression-suite/0513-iCal-PUT.result
index cb1a01ff..c3236953 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-Type: text/plain; charset="utf-8"
 
 
       CalDAV Data: >BEGIN:VCALENDAR
diff --git a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result
index 0b87ec3b..ce0c451c 100644
--- a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/0806-Mulberry-DELETE-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-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 be66c37b..ee765e38 100644
--- a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.result
@@ -2,5 +2,4 @@ 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-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 be66c37b..ee765e38 100644
--- a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.result
@@ -2,5 +2,4 @@ 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-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 be66c37b..ee765e38 100644
--- a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.result
@@ -2,5 +2,4 @@ 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-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 4a755643..2cb1570c 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-Type: text/plain; charset="utf-8"
 
 
      dav_owner_id: >1002<
diff --git a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result
index 80a4b730..d3e360b5 100644
--- a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.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-Type: text/plain; charset="utf-8"
 
 
       caldav_type: >VEVENT<
diff --git a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result
index 036863b8..b1119784 100644
--- a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result
@@ -7,7 +7,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-Type: text/plain; charset="utf-8"
 
 
       caldav_type: >VEVENT<
diff --git a/testing/tests/scheduling/3025-DELETE-invite.result b/testing/tests/scheduling/3025-DELETE-invite.result
index 9bf712b5..099236d0 100644
--- a/testing/tests/scheduling/3025-DELETE-invite.result
+++ b/testing/tests/scheduling/3025-DELETE-invite.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-Type: text/plain; charset="utf-8"
 
 
          dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
diff --git a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
index 9d8bf6ef..445c2842 100644
--- a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.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-Type: text/plain; charset="utf-8"
 
 
       caldav_type: >VEVENT<
diff --git a/testing/tests/scheduling/3028-DELETE-reply.result b/testing/tests/scheduling/3028-DELETE-reply.result
index a84513f4..a76dc02c 100644
--- a/testing/tests/scheduling/3028-DELETE-reply.result
+++ b/testing/tests/scheduling/3028-DELETE-reply.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-Type: text/plain; charset="utf-8"
 
 
          dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
diff --git a/testing/tests/scheduling/3029-DELETE-reply.result b/testing/tests/scheduling/3029-DELETE-reply.result
index 9bf712b5..099236d0 100644
--- a/testing/tests/scheduling/3029-DELETE-reply.result
+++ b/testing/tests/scheduling/3029-DELETE-reply.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-Type: text/plain; charset="utf-8"
 
 
          dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
diff --git a/testing/tests/scheduling/3030-DELETE-attendee-event.result b/testing/tests/scheduling/3030-DELETE-attendee-event.result
index e2665528..e2bba008 100644
--- a/testing/tests/scheduling/3030-DELETE-attendee-event.result
+++ b/testing/tests/scheduling/3030-DELETE-attendee-event.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-Type: text/plain; charset="utf-8"
 
 
          dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
diff --git a/testing/tests/scheduling/3031-DELETE-reply.result b/testing/tests/scheduling/3031-DELETE-reply.result
index 095b538e..fad80371 100644
--- a/testing/tests/scheduling/3031-DELETE-reply.result
+++ b/testing/tests/scheduling/3031-DELETE-reply.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-Type: text/plain; charset="utf-8"
 
 
          dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
diff --git a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
index ff9f2ce3..f85a166a 100644
--- a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
@@ -4,7 +4,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-Type: text/plain; charset="utf-8"
 
 
       caldav_type: >VEVENT<
diff --git a/testing/tests/scheduling/3033-DELETE-organizer-event.result b/testing/tests/scheduling/3033-DELETE-organizer-event.result
index be34858c..b547e076 100644
--- a/testing/tests/scheduling/3033-DELETE-organizer-event.result
+++ b/testing/tests/scheduling/3033-DELETE-organizer-event.result
@@ -5,7 +5,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-Type: text/plain; charset="utf-8"
 
 
       caldav_data: >BEGIN:VCALENDAR