diff --git a/lib/multipart.js b/lib/multipart.js
index 390a7f2d1..905a54b7f 100644
--- a/lib/multipart.js
+++ b/lib/multipart.js
@@ -56,7 +56,7 @@ Multipart.prototype.setHeaders = function (chunked) {
     self.request.setHeader('content-type', 'multipart/related; boundary=' + self.boundary)
   } else {
     if (header.indexOf('boundary') !== -1) {
-      self.boundary = header.replace(/.*boundary=([^\s;])+.*/, '$1')
+      self.boundary = header.replace(/.*boundary=([^\s;]+).*/, '$1')
     } else {
       self.request.setHeader('content-type', header + '; boundary=' + self.boundary)
     }
diff --git a/tests/test-multipart.js b/tests/test-multipart.js
index f7c6dcb00..fc64c8493 100644
--- a/tests/test-multipart.js
+++ b/tests/test-multipart.js
@@ -59,8 +59,8 @@ function runTest(t, a) {
       // check for http://localhost:6767/file traces
       t.ok(data.indexOf('Photoshop ICC') !== -1)
 
-      if (a.header && a.header.indexOf('mixed') !== -1) {
-        t.ok(data.indexOf('boundary=XXX'))
+      if (a.header && a.header.indexOf('boundary=XXX') !== -1) {
+        t.ok(data.indexOf('--XXX') !== -1)
       }
 
       res.writeHead(200)