diff --git a/Makefile b/Makefile
index 61ffbe3c99..aaddd6e98c 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,7 @@ UVTEST += simple/test-http-proxy
 UVTEST += simple/test-http-request-end
 UVTEST += simple/test-http-response-close
 UVTEST += simple/test-http-response-readable
+UVTEST += simple/test-http-unix-socket
 UVTEST += simple/test-http-server
 UVTEST += simple/test-http-server-multiheaders
 UVTEST += simple/test-http-set-cookies
diff --git a/test/simple/test-http-unix-socket.js b/test/simple/test-http-unix-socket.js
index 2184663ed6..d43f573c01 100644
--- a/test/simple/test-http-unix-socket.js
+++ b/test/simple/test-http-unix-socket.js
@@ -26,6 +26,10 @@ var http = require('http');
 
 var SOCKET = common.tmpDir + '/http.sock';
 
+var status_ok  = false; // status code == 200?
+var headers_ok = false;
+var body_ok    = false;
+
 var server = http.createServer(function(req, res) {
   res.writeHead(200, {'Content-Type': 'text/plain',
                       'Connection': 'close'
@@ -44,14 +48,21 @@ server.listen(SOCKET, function() {
 
   var req = http.get(options, function(res) {
     assert.equal(res.statusCode, 200);
+    status_ok = true;
+
     assert.equal(res.headers['content-type'], 'text/plain');
+    headers_ok = true;
+
     res.body = '';
     res.setEncoding('utf8');
+
     res.on('data', function (chunk) {
       res.body += chunk;
     });
+
     res.on('end', function() {
       assert.equal(res.body, 'hello world\n');
+      body_ok = true;
       server.close();
     });
   });
@@ -72,7 +83,8 @@ server.on('close', function() {
 });
 
 process.on('exit', function() {
-  try {
-    server.close();
-  } catch (e) {}
+  server.close();
+  assert.ok(status_ok);
+  assert.ok(headers_ok);
+  assert.ok(body_ok);
 });