diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php
index 48c4d819..e1a99564 100644
--- a/inc/CalDAVRequest.php
+++ b/inc/CalDAVRequest.php
@@ -499,7 +499,7 @@ class CalDAVRequest
   * @param int $status The HTTP status code to send.
   * @param string $message The friendly text message to send with the response.
   */
-  function DoResponse( $status, $message="", $content_type="text/plain" ) {
+  function DoResponse( $status, $message="", $content_type="text/plain; charset=\"utf-8\"" ) {
     global $session, $c;
     @header( sprintf("HTTP/1.1 %d %s", $status, getStatusMessage($status)) );
     @header( sprintf("X-RSCDS-Version: RSCDS/%d.%d.%d; DB/%d.%d.%d", $c->code_major, $c->code_minor, $c->code_patch, $c->schema_major, $c->schema_minor, $c->schema_patch) );
diff --git a/testing/tests/regression-suite/001-Mulberry-1.result b/testing/tests/regression-suite/001-Mulberry-1.result
index b6ed89a9..b6a4a51f 100644
--- a/testing/tests/regression-suite/001-Mulberry-1.result
+++ b/testing/tests/regression-suite/001-Mulberry-1.result
@@ -3,5 +3,5 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/004-Mulberry-1.result b/testing/tests/regression-suite/004-Mulberry-1.result
index 2c6bd086..6e110ab3 100644
--- a/testing/tests/regression-suite/004-Mulberry-1.result
+++ b/testing/tests/regression-suite/004-Mulberry-1.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Cache-Control: no-cache
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/007-Mulberry-1.result b/testing/tests/regression-suite/007-Mulberry-1.result
index 4ae92d7a..8863aeea 100644
--- a/testing/tests/regression-suite/007-Mulberry-1.result
+++ b/testing/tests/regression-suite/007-Mulberry-1.result
@@ -1,6 +1,6 @@
 HTTP/1.1 405 Method Not Allowed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 45
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
 A collection already exists at that location.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/010-Mulberry-PUT-1.result b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
index be62c5f8..0a6ba774 100644
--- a/testing/tests/regression-suite/010-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
index 36f2632a..5dc03f38 100644
--- a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
+++ b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
@@ -2,5 +2,5 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/012-Mulberry-PUT-2.result b/testing/tests/regression-suite/012-Mulberry-PUT-2.result
index e2cb9ef6..1de81e3d 100644
--- a/testing/tests/regression-suite/012-Mulberry-PUT-2.result
+++ b/testing/tests/regression-suite/012-Mulberry-PUT-2.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "22158fc45876987b2b00749a3a1684d8"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/014-Mulberry-PUT-3.result b/testing/tests/regression-suite/014-Mulberry-PUT-3.result
index c99a54bc..45589c03 100644
--- a/testing/tests/regression-suite/014-Mulberry-PUT-3.result
+++ b/testing/tests/regression-suite/014-Mulberry-PUT-3.result
@@ -2,5 +2,5 @@ HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "2c32a2f8aba853654eb17fe037a4db4d"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result b/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
index 2c6bd086..6e110ab3 100644
--- a/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
+++ b/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Cache-Control: no-cache
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result b/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
index 760c5f82..96547dad 100644
--- a/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
+++ b/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
@@ -1,6 +1,6 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 36
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
 You may not create a calendar there.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/018-Mulberry-PUT-4.result b/testing/tests/regression-suite/018-Mulberry-PUT-4.result
index 4703eeb4..32f2fba3 100644
--- a/testing/tests/regression-suite/018-Mulberry-PUT-4.result
+++ b/testing/tests/regression-suite/018-Mulberry-PUT-4.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "75a75e1c7c4546074aab7645b5323738"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
index 0e01fe29..1125a74c 100644
--- a/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
+++ b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
@@ -2,6 +2,6 @@ HTTP/1.1 400 Bad Request
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 46
 Connection: close
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
 The calendar path contains illegal characters.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/020-Mulberry-DELETE-1.result b/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
index aaf4f6b7..e81072c3 100644
--- a/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
@@ -1,6 +1,6 @@
 HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 44
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
 Resource has changed on server - not deleted
\ No newline at end of file
diff --git a/testing/tests/regression-suite/021-Mulberry-DELETE-2.result b/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
index 18d2005f..acd10a41 100644
--- a/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
+++ b/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
@@ -1,5 +1,5 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/022-Mulberry-PUT-5.result b/testing/tests/regression-suite/022-Mulberry-PUT-5.result
index dddddb5a..ea2ed7cd 100644
--- a/testing/tests/regression-suite/022-Mulberry-PUT-5.result
+++ b/testing/tests/regression-suite/022-Mulberry-PUT-5.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "81979ab45975368d619171a4c3e1e5e2"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/023-Mulberry-DELETE-3.result b/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
index 18d2005f..acd10a41 100644
--- a/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
+++ b/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
@@ -1,5 +1,5 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/100-Evo-OPTIONS-1.result b/testing/tests/regression-suite/100-Evo-OPTIONS-1.result
index dff7e020..ccf9a32d 100644
--- a/testing/tests/regression-suite/100-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/100-Evo-OPTIONS-1.result
@@ -1,8 +1,7 @@
-HTTP/1.0 401 Unauthorized
+HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
 Content-Length: 40
-Connection: close
-Content-Type: text/html; charset=UTF-8
+Content-Type: text/plain; ; charset="utf-8"
 
 Please log in for access to this system.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
index b6ed89a9..b6a4a51f 100644
--- a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
@@ -3,5 +3,5 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/104-Evo-PUT-1.result b/testing/tests/regression-suite/104-Evo-PUT-1.result
index ed3d9a68..82f5ac6f 100644
--- a/testing/tests/regression-suite/104-Evo-PUT-1.result
+++ b/testing/tests/regression-suite/104-Evo-PUT-1.result
@@ -4,5 +4,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "c3658901fd4689d4a1e1d6f08601ef4f"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/200-Moz-OPTIONS-1.result b/testing/tests/regression-suite/200-Moz-OPTIONS-1.result
index dff7e020..ccf9a32d 100644
--- a/testing/tests/regression-suite/200-Moz-OPTIONS-1.result
+++ b/testing/tests/regression-suite/200-Moz-OPTIONS-1.result
@@ -1,8 +1,7 @@
-HTTP/1.0 401 Unauthorized
+HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
 Content-Length: 40
-Connection: close
-Content-Type: text/html; charset=UTF-8
+Content-Type: text/plain; ; charset="utf-8"
 
 Please log in for access to this system.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
index b6ed89a9..b6a4a51f 100644
--- a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
+++ b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
@@ -3,5 +3,5 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/202-Moz-REPORT-1.result b/testing/tests/regression-suite/202-Moz-REPORT-1.result
index dff7e020..ccf9a32d 100644
--- a/testing/tests/regression-suite/202-Moz-REPORT-1.result
+++ b/testing/tests/regression-suite/202-Moz-REPORT-1.result
@@ -1,8 +1,7 @@
-HTTP/1.0 401 Unauthorized
+HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
 Content-Length: 40
-Connection: close
-Content-Type: text/html; charset=UTF-8
+Content-Type: text/plain; ; charset="utf-8"
 
 Please log in for access to this system.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/206-Moz-PUT-1.result b/testing/tests/regression-suite/206-Moz-PUT-1.result
index e25f5404..914cb826 100644
--- a/testing/tests/regression-suite/206-Moz-PUT-1.result
+++ b/testing/tests/regression-suite/206-Moz-PUT-1.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "a1c6404d61190f9574e2bfd69383f144"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/209-Moz-PUT-CONFIDENTIAL.result b/testing/tests/regression-suite/209-Moz-PUT-CONFIDENTIAL.result
index b94f7c7f..b912c6e2 100644
--- a/testing/tests/regression-suite/209-Moz-PUT-CONFIDENTIAL.result
+++ b/testing/tests/regression-suite/209-Moz-PUT-CONFIDENTIAL.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "08a435c2abaf38f4a50a997343c098a7"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result b/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result
index bc24f14f..62437c7e 100644
--- a/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result
+++ b/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "5def8ae2b20893a1c7f4dbaeb008f2f1"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/211-Moz-PUT-TENTATIVE.result b/testing/tests/regression-suite/211-Moz-PUT-TENTATIVE.result
index 56a08af5..1463944c 100644
--- a/testing/tests/regression-suite/211-Moz-PUT-TENTATIVE.result
+++ b/testing/tests/regression-suite/211-Moz-PUT-TENTATIVE.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "ac90acd649c25070b1a2a17fb31a105a"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/213-Moz-MKCALENDAR.result b/testing/tests/regression-suite/213-Moz-MKCALENDAR.result
index 2c6bd086..6e110ab3 100644
--- a/testing/tests/regression-suite/213-Moz-MKCALENDAR.result
+++ b/testing/tests/regression-suite/213-Moz-MKCALENDAR.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Cache-Control: no-cache
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result b/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result
index dff7e020..ccf9a32d 100644
--- a/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result
+++ b/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result
@@ -1,8 +1,7 @@
-HTTP/1.0 401 Unauthorized
+HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
 Content-Length: 40
-Connection: close
-Content-Type: text/html; charset=UTF-8
+Content-Type: text/plain; ; charset="utf-8"
 
 Please log in for access to this system.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/301-Chandler-HEAD-1.result b/testing/tests/regression-suite/301-Chandler-HEAD-1.result
index e7557974..9ebc741e 100644
--- a/testing/tests/regression-suite/301-Chandler-HEAD-1.result
+++ b/testing/tests/regression-suite/301-Chandler-HEAD-1.result
@@ -1,6 +1,5 @@
-HTTP/1.0 401 Unauthorized
+HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
-Connection: close
-Content-Type: text/html; charset=UTF-8
+Content-Type: text/plain; ; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
index b6ed89a9..b6a4a51f 100644
--- a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
+++ b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
@@ -3,5 +3,5 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/305-Chandler-MKCOL-1.result b/testing/tests/regression-suite/305-Chandler-MKCOL-1.result
index aace9696..20e731b0 100644
--- a/testing/tests/regression-suite/305-Chandler-MKCOL-1.result
+++ b/testing/tests/regression-suite/305-Chandler-MKCOL-1.result
@@ -2,6 +2,6 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Cache-Control: no-cache
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
 10 --- /user1/home/ --- /user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/ --- 72205b235fa2a3dfd18535c0793b89b2 --- .ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp --- 0
diff --git a/testing/tests/regression-suite/306-Chandler-DELETE-1.result b/testing/tests/regression-suite/306-Chandler-DELETE-1.result
index 39d9fa7a..e6ad1353 100644
--- a/testing/tests/regression-suite/306-Chandler-DELETE-1.result
+++ b/testing/tests/regression-suite/306-Chandler-DELETE-1.result
@@ -1,6 +1,6 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
 Count of matching calendars (should be 0) --- 0
diff --git a/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result b/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result
index b6ed89a9..b6a4a51f 100644
--- a/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result
+++ b/testing/tests/regression-suite/308-Chandler-OPTIONS-3.result
@@ -3,5 +3,5 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/310-Chandler-PUT-1.result b/testing/tests/regression-suite/310-Chandler-PUT-1.result
index 9f45c1ef..92a9a4a5 100644
--- a/testing/tests/regression-suite/310-Chandler-PUT-1.result
+++ b/testing/tests/regression-suite/310-Chandler-PUT-1.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "0d7a68984bf525342d22b8924a57e8e2"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/311-Chandler-PUT-2.result b/testing/tests/regression-suite/311-Chandler-PUT-2.result
index ef2dc4f2..dab67f6a 100644
--- a/testing/tests/regression-suite/311-Chandler-PUT-2.result
+++ b/testing/tests/regression-suite/311-Chandler-PUT-2.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "421abf7e4848d2fecbf64217ed205d4b"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
index b6ed89a9..b6a4a51f 100644
--- a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
+++ b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
@@ -3,5 +3,5 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, LOCK, UNLOCK, REPORT, PROPPATCH
 DAV: 1, 2, access-control, calendar-access
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/804-Mulberry-PUT-1.result b/testing/tests/regression-suite/804-Mulberry-PUT-1.result
index be62c5f8..0a6ba774 100644
--- a/testing/tests/regression-suite/804-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/804-Mulberry-PUT-1.result
@@ -2,5 +2,5 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/806-Mulberry-DELETE-1.result b/testing/tests/regression-suite/806-Mulberry-DELETE-1.result
index 18d2005f..acd10a41 100644
--- a/testing/tests/regression-suite/806-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/806-Mulberry-DELETE-1.result
@@ -1,5 +1,5 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/809-Spec-UNLOCK-1.result b/testing/tests/regression-suite/809-Spec-UNLOCK-1.result
index 18d2005f..acd10a41 100644
--- a/testing/tests/regression-suite/809-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/809-Spec-UNLOCK-1.result
@@ -1,5 +1,5 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/816-Spec-UNLOCK-1.result b/testing/tests/regression-suite/816-Spec-UNLOCK-1.result
index 18d2005f..acd10a41 100644
--- a/testing/tests/regression-suite/816-Spec-UNLOCK-1.result
+++ b/testing/tests/regression-suite/816-Spec-UNLOCK-1.result
@@ -1,5 +1,5 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/831-Spec-RRULE-1.result b/testing/tests/regression-suite/831-Spec-RRULE-1.result
index d77c5c05..3070325a 100644
--- a/testing/tests/regression-suite/831-Spec-RRULE-1.result
+++ b/testing/tests/regression-suite/831-Spec-RRULE-1.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 5020
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain
 
 Testing the RRule Library
 20061103T073000 - RRULE:FREQ=DAILY;COUNT=7
diff --git a/testing/tests/regression-suite/837-freebusy.result b/testing/tests/regression-suite/837-freebusy.result
index 4bf29a16..0045a3e6 100644
--- a/testing/tests/regression-suite/837-freebusy.result
+++ b/testing/tests/regression-suite/837-freebusy.result
@@ -1,5 +1,5 @@
 HTTP/1.1 404 Not Found
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/902-PUT-collection.result b/testing/tests/regression-suite/902-PUT-collection.result
index c8ceff0b..b55065c2 100644
--- a/testing/tests/regression-suite/902-PUT-collection.result
+++ b/testing/tests/regression-suite/902-PUT-collection.result
@@ -3,5 +3,5 @@ HTTP/1.1 100 Continue
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Length: 0
-Content-Type: text/plain; charset=UTF-8
+Content-Type: text/plain; charset="utf-8"