diff --git a/test/simple/test-http-client-parse-error.js b/test/simple/test-http-client-parse-error.js
new file mode 100644
index 00000000000..f3a4497c9ef
--- /dev/null
+++ b/test/simple/test-http-client-parse-error.js
@@ -0,0 +1,34 @@
+var common = require("../common");
+var assert = require('assert');
+
+var http = require('http');
+var net = require('net');
+
+// Create a TCP server
+var srv = net.createServer(function(c) {
+  c.write('bad http - should trigger parse error\r\n');
+
+  console.log("connection");
+
+  c.addListener('end', function() { c.end(); });
+});
+srv.listen(common.PORT, '127.0.0.1');
+
+var hc = http.createClient(common.PORT, '127.0.0.1');
+hc.request('GET', '/').end();
+
+var parseError = false;
+
+hc.on('error', function (e) {
+  console.log("got error from client");
+  srv.close();
+  assert.ok(e.message.indexOf("Parse Error") >= 0);
+  parseError = true;
+});
+
+
+process.addListener('exit', function() {
+  assert.ok(parseError);
+});
+
+