diff --git a/test/common.js b/test/common.js
index cfc41b3b..f0150dd1 100644
--- a/test/common.js
+++ b/test/common.js
@@ -56,7 +56,7 @@ HTTPClient.prototype.request = function (path, opts, fn) {
     , 'Connection': 'keep-alive'
   };
 
-  var req = (opts.secure ? https : http).request(opts, function (res) {
+  var req = http.request(opts, function (res) {
     var buf = '';
 
     res.on('data', function (chunk) {
diff --git a/test/io.test.js b/test/io.test.js
index ffe4343f..adc316e9 100644
--- a/test/io.test.js
+++ b/test/io.test.js
@@ -38,14 +38,16 @@ module.exports = {
   },
 
   'test listening with a port': function (done) {
-    var port = ++ports
-      , io = sio.listen(port);
+    var cl = client(++ports)
+      , io = create(cl);
 
     io.server.should.be.an.instanceof(http.Server);
 
-    get('/', port, function (res, data) {
+    cl.get('/', function (res, data) {
       res.statusCode.should.eql(200);
       data.should.eql('Welcome to socket.io.');
+
+      cl.end();
       io.server.close();
       done();
     });
@@ -54,14 +56,16 @@ module.exports = {
   'test listening with a server': function (done) {
     var server = http.createServer()
       , io = sio.listen(server)
-      , port = ++ports;
+      , port = ++ports
+      , cl = client(port);
 
     server.listen(port);
 
-    get('/socket.io', port, function (res, data) {
+    cl.get('/socket.io', function (res, data) {
       res.statusCode.should.eql(200);
       data.should.eql('Welcome to socket.io.');
-      
+
+      cl.end();
       server.close();
       done();
     });
@@ -77,20 +81,38 @@ module.exports = {
 
     server.listen(port);
 
-    get('/socket.io', port, { secure: true }, function (res, data) {
+    var req = require('https').get({
+        host: 'localhost'
+      , port: port
+      , path: '/socket.io'
+    }, function (res) {
       res.statusCode.should.eql(200);
-      data.should.eql('Welcome to socket.io.');
-      
-      server.close();
-      done();
+
+      var buf = '';
+
+      res.on('data', function (data) {
+        buf += data;
+      });
+
+      res.on('end', function () {
+        buf.should.eql('Welcome to socket.io.');
+
+        res.socket.end();
+        server.close();
+        done();
+      });
     });
   },
 
   'test listening with no arguments listens on 80': function (done) {
     try {
-      var io = sio.listen();
-      get('/socket.io', 80, function (res) {
+      var io = sio.listen()
+        , cl = client(80);
+
+      cl.get('/socket.io', function (res) {
         res.statusCode.should.eql(200);
+
+        cl.end();
         io.server.close();
         done();
       });
diff --git a/test/manager.test.js b/test/manager.test.js
index 39f45ab7..978cc1be 100644
--- a/test/manager.test.js
+++ b/test/manager.test.js
@@ -72,15 +72,17 @@ module.exports = {
     });
 
     var io = sio.listen(server)
-      , port = ++ports;
+      , port = ++ports
+      , cl = client(port);
 
     server.listen(ports);
     
-    get('/socket.io', port, function (res, data) {
+    cl.get('/socket.io', function (res, data) {
       res.statusCode.should.eql(200);
       data.should.eql('Welcome to socket.io.');
 
-      get('/woot', port, function (res, data) {
+      cl.get('/woot', function (res, data) {
+        cl.end();
         server.close();
         done();
       });
@@ -89,15 +91,17 @@ module.exports = {
 
   'test that the client is served': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
-    get('/socket.io/socket.io.js', port, function (res, data) {
+    cl.get('/socket.io/socket.io.js', function (res, data) {
       res.headers['content-type'].should.eql('application/javascript');
       res.headers['content-length'].should.be.match(/([0-9]+)/);
       res.headers.etag.should.match(/([0-9]+)\.([0-9]+)\.([0-9]+)/);
 
       data.should.match(/XMLHttpRequest/);
 
+      cl.end();
       io.server.close();
       done();
     });
@@ -105,20 +109,22 @@ module.exports = {
 
   'test that you can serve custom clients': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
     io.configure(function () {
       io.set('browser client', 'custom_client');
       io.set('browser client etag', '1.0');
     });
 
-    get('/socket.io/socket.io.js', port, function (res, data) {
+    cl.get('/socket.io/socket.io.js', function (res, data) {
       res.headers['content-type'].should.eql('application/javascript');
       res.headers['content-length'].should.eql(13);
       res.headers.etag.should.eql('1.0');
 
       data.should.eql('custom_client');
 
+      cl.end();
       io.server.close();
       done();
     });
@@ -126,11 +132,14 @@ module.exports = {
 
   'test handshake': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
-    get('/socket.io/{protocol}/', port, function (res, data) {
+    cl.get('/socket.io/{protocol}/', function (res, data) {
       res.statusCode.should.eql(200);
       data.should.match(/([^:]+):([0-9]+)?:([0-9]+)?:(.+)/);
+
+      cl.end();
       io.server.close();
       done();
     });
@@ -138,11 +147,14 @@ module.exports = {
 
   'test handshake with unsupported protocol version': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
-    get('/socket.io/-1/', port, function (res, data) {
+    cl.get('/socket.io/-1/', function (res, data) {
       res.statusCode.should.eql(500);
       data.should.match(/Protocol version not supported/);
+
+      cl.end();
       io.server.close();
       done();
     });
@@ -150,7 +162,8 @@ module.exports = {
 
   'test authorization failure in handshake': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
     io.configure(function () {
       function auth (data, fn) {
@@ -160,9 +173,11 @@ module.exports = {
       io.set('authorization', auth);
     });
 
-    get('/socket.io/{protocol}/', port, function (res, data) {
+    cl.get('/socket.io/{protocol}/', function (res, data) {
       res.statusCode.should.eql(403);
       data.should.match(/Handshake unauthorized/);
+
+      cl.end();
       io.server.close();
       done();
     });
@@ -170,7 +185,8 @@ module.exports = {
 
   'test a handshake error': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
     io.configure(function () {
       function auth (data, fn) {
@@ -180,9 +196,11 @@ module.exports = {
       io.set('authorization', auth);
     });
 
-    get('/socket.io/{protocol}/', port, function (res, data) {
+    cl.get('/socket.io/{protocol}/', function (res, data) {
       res.statusCode.should.eql(500);
       data.should.match(/Handshake error/);
+
+      cl.end();
       io.server.close();
       done();
     });
@@ -190,15 +208,18 @@ module.exports = {
 
   'test limiting the supported transports for a manager': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
     io.configure(function () {
       io.set('transports', ['tobi', 'jane']);
     });
 
-    get('/socket.io/{protocol}/', port, function (res, data) {
+    cl.get('/socket.io/{protocol}/', function (res, data) {
       res.statusCode.should.eql(200);
       data.should.match(/([^:]+):([0-9]+)?:([0-9]+)?:tobi,jane/);
+
+      cl.end();
       io.server.close();
       done();
     });
@@ -206,15 +227,18 @@ module.exports = {
 
   'test setting a custom close timeout': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
     io.configure(function () {
       io.set('close timeout', 66);
     });
 
-    get('/socket.io/{protocol}/', port, function (res, data) {
+    cl.get('/socket.io/{protocol}/', function (res, data) {
       res.statusCode.should.eql(200);
       data.should.match(/([^:]+):([0-9]+)?:66?:(.*)/);
+
+      cl.end();
       io.server.close();
       done();
     });
@@ -222,15 +246,18 @@ module.exports = {
 
   'test setting a custom heartbeat timeout': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
     io.configure(function () {
       io.set('heartbeat timeout', 33);
     });
 
-    get('/socket.io/{protocol}/', port, function (res, data) {
+    cl.get('/socket.io/{protocol}/', function (res, data) {
       res.statusCode.should.eql(200);
       data.should.match(/([^:]+):33:([0-9]+)?:(.*)/);
+
+      cl.end();
       io.server.close();
       done();
     });
@@ -238,16 +265,19 @@ module.exports = {
 
   'test disabling timeouts': function (done) {
     var port = ++ports
-      , io = sio.listen(port);
+      , io = sio.listen(port)
+      , cl = client(port);
 
     io.configure(function () {
       io.set('heartbeat timeout', null);
       io.set('close timeout', '');
     });
 
-    get('/socket.io/{protocol}/', port, function (res, data) {
+    cl.get('/socket.io/{protocol}/', function (res, data) {
       res.statusCode.should.eql(200);
       data.should.match(/([^:]+)::?:(.*)/);
+
+      cl.end();
       io.server.close();
       done();
     });