diff --git a/test/simple/test-http-client-timeout-event.js b/test/simple/test-http-client-timeout-event.js
index 9e0e8bd8e5..1064e15ac6 100644
--- a/test/simple/test-http-client-timeout-event.js
+++ b/test/simple/test-http-client-timeout-event.js
@@ -54,5 +54,7 @@ server.listen(options.port, options.host, function() {
     req.destroy();
     assert.equal(timeout_events, 1);
   }, 10);
-  req.end();
+  setTimeout(function () {
+    req.end();
+  }, 5);
 });
diff --git a/test/simple/test-http-upgrade-server.js b/test/simple/test-http-upgrade-server.js
index 6a14d39aa5..84525a8498 100644
--- a/test/simple/test-http-upgrade-server.js
+++ b/test/simple/test-http-upgrade-server.js
@@ -155,7 +155,7 @@ function test_standard_http() {
     writeReq(conn, 'GET / HTTP/1.1\r\n\r\n');
   });
 
-  conn.on('data', function(data) {
+  conn.once('data', function(data) {
     assert.equal('string', typeof data);
     assert.equal('HTTP/1.1 200', data.substr(0, 12));
     conn.end();