diff --git a/benchmark/net/chunky_http_client.js b/benchmark/http/_chunky_http_client.js
similarity index 100%
rename from benchmark/net/chunky_http_client.js
rename to benchmark/http/_chunky_http_client.js
diff --git a/benchmark/net/http_server_for_chunky_client.js b/benchmark/http/http_server_for_chunky_client.js
similarity index 76%
rename from benchmark/net/http_server_for_chunky_client.js
rename to benchmark/http/http_server_for_chunky_client.js
index 5439e7226eef39..dede7daa7cdc75 100644
--- a/benchmark/net/http_server_for_chunky_client.js
+++ b/benchmark/http/http_server_for_chunky_client.js
@@ -6,9 +6,15 @@ var fs = require('fs');
 var spawn = require('child_process').spawn;
 var common = require('../common.js')
 var test = require('../../test/common.js')
-var pep = path.dirname(process.argv[1]) + '/chunky_http_client.js';
+var pep = path.dirname(process.argv[1]) + '/_chunky_http_client.js';
 var PIPE = test.PIPE;
 
+try {
+  fs.accessSync(test.tmpDir, fs.F_OK);
+} catch (e) {
+  fs.mkdirSync(test.tmpDir);
+}
+
 var server;
 try {
   fs.unlinkSync(PIPE);
@@ -36,9 +42,10 @@ try {
   });
 
   child.stdout.pipe(process.stdout);
+  child.stderr.pipe(process.stderr);
 
-  child.on('exit', function (exitCode) {
-    console.error('Child exited with code: ' + exitCode);
+  child.on('close', function (exitCode) {
+    server.close();
   });
 
 } catch(e) {