diff --git a/test/core/simple/test-http-multi-line-headers.js b/test/core/simple/test-http-multi-line-headers.js
new file mode 100644
index 000000000..aa00a7666
--- /dev/null
+++ b/test/core/simple/test-http-multi-line-headers.js
@@ -0,0 +1,59 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+var http = require('http');
+var net = require('net');
+
+var gotResponse = false;
+
+var server = net.createServer(function(conn) {
+  var body = 'Yet another node.js server.';
+
+  var response =
+      'HTTP/1.1 200 OK\r\n' +
+      'Connection: close\r\n' +
+      'Content-Length: ' + body.length + '\r\n' +
+      'Content-Type: text/plain;\r\n' +
+      ' x-unix-mode=0600;\r\n' +
+      ' name=\"hello.txt\"\r\n' +
+      '\r\n' +
+      body;
+
+  conn.write(response, function() {
+    conn.destroy();
+    server.close();
+  });
+});
+
+server.listen(common.PORT, function() {
+  http.get({host: '127.0.0.1', port: common.PROXY_PORT}, function(res) {
+    assert.equal(res.headers['content-type'],
+                 'text/plain;x-unix-mode=0600;name="hello.txt"');
+    gotResponse = true;
+  });
+});
+
+process.on('exit', function() {
+  assert.ok(gotResponse);
+});