diff --git a/Net/src/HTMLForm.cpp b/Net/src/HTMLForm.cpp
index 0849f76624..e81f775074 100644
--- a/Net/src/HTMLForm.cpp
+++ b/Net/src/HTMLForm.cpp
@@ -219,9 +219,8 @@ void HTMLForm::prepareSubmit(HTTPRequest& request, int options)
 		{
 			_boundary = MultipartWriter::createBoundary();
 			std::string ct(_encoding);
-			ct.append("; boundary=\"");
+			ct.append("; boundary=");
 			ct.append(_boundary);
-			ct.append("\"");
 			request.setContentType(ct);
 		}
 		if (request.getVersion() == HTTPMessage::HTTP_1_0)
diff --git a/Net/testsuite/src/HTMLFormTest.cpp b/Net/testsuite/src/HTMLFormTest.cpp
index 49a7906fc8..a93a95646b 100644
--- a/Net/testsuite/src/HTMLFormTest.cpp
+++ b/Net/testsuite/src/HTMLFormTest.cpp
@@ -254,7 +254,7 @@ void HTMLFormTest::testReadMultipart()
 		"--MIME_boundary_0123456789--\r\n"
 	);
 	HTTPRequest req("POST", "/form.cgi");
-	req.setContentType(HTMLForm::ENCODING_MULTIPART + "; boundary=\"MIME_boundary_0123456789\"");
+	req.setContentType(HTMLForm::ENCODING_MULTIPART + "; boundary=MIME_boundary_0123456789");
 	StringPartHandler sah;
 	HTMLForm form(req, istr, sah);
 	assertTrue (form.size() == 4);
@@ -309,9 +309,8 @@ void HTMLFormTest::testSubmit3()
 	HTTPRequest req("POST", "/form.cgi", HTTPMessage::HTTP_1_1);
 	form.prepareSubmit(req);
 	std::string expCT(HTMLForm::ENCODING_MULTIPART);
-	expCT.append("; boundary=\"");
+	expCT.append("; boundary=");
 	expCT.append(form.boundary());
-	expCT.append("\"");
 	assertTrue (req.getContentType() == expCT);
 	assertTrue (req.getChunkedTransferEncoding());
 }
@@ -343,9 +342,8 @@ void HTMLFormTest::testSubmit5()
 	HTTPRequest req("POST", "/form.cgi", HTTPMessage::HTTP_1_1);
 	form.prepareSubmit(req, HTMLForm::OPT_USE_CONTENT_LENGTH);
 	std::string expCT(HTMLForm::ENCODING_MULTIPART);
-	expCT.append("; boundary=\"");
+	expCT.append("; boundary=");
 	expCT.append(form.boundary());
-	expCT.append("\"");
 	assertTrue (req.getContentType() == expCT);
 	assertTrue (req.getContentLength() == 403);
 }
@@ -395,7 +393,7 @@ void HTMLFormTest::testFieldLimitMultipart()
 		"--MIME_boundary_0123456789--\r\n"
 	);
 	HTTPRequest req("POST", "/form.cgi");
-	req.setContentType(HTMLForm::ENCODING_MULTIPART + "; boundary=\"MIME_boundary_0123456789\"");
+	req.setContentType(HTMLForm::ENCODING_MULTIPART + "; boundary=MIME_boundary_0123456789");
 	StringPartHandler sah;
 	HTMLForm form;
 	form.setFieldLimit(3);
diff --git a/Net/testsuite/src/MediaTypeTest.cpp b/Net/testsuite/src/MediaTypeTest.cpp
index d2e8431c0f..e6df0555bf 100644
--- a/Net/testsuite/src/MediaTypeTest.cpp
+++ b/Net/testsuite/src/MediaTypeTest.cpp
@@ -47,7 +47,7 @@ void MediaTypeTest::testParse()
 	assertTrue (mt3.getParameter("param1") == "value1");
 	assertTrue (mt3.getParameter("PARAM2") == "value 2");
 
-	MediaType mt4("multipart/mixed; boundary=\"MIME_boundary_01234567\"");
+	MediaType mt4("multipart/mixed; boundary=MIME_boundary_01234567");
 	assertTrue (mt4.getType() == "multipart");
 	assertTrue (mt4.getSubType() == "mixed");
 	assertTrue (mt4.parameters().size() == 1);
diff --git a/Net/testsuite/src/MessageHeaderTest.cpp b/Net/testsuite/src/MessageHeaderTest.cpp
index 9a7452e40f..9ce728c875 100644
--- a/Net/testsuite/src/MessageHeaderTest.cpp
+++ b/Net/testsuite/src/MessageHeaderTest.cpp
@@ -309,7 +309,7 @@ void MessageHeaderTest::testSplitParameters()
 	assertTrue (p.size() == 1);
 	assertTrue (p["boundary"] == "MIME_boundary_01234567");
 
-	s = "multipart/related; boundary=\"MIME_boundary_76543210\"";
+	s = "multipart/related; boundary=MIME_boundary_76543210";
 	MessageHeader::splitParameters(s, v, p);
 	assertTrue (v == "multipart/related");
 	assertTrue (p.size() == 1);