diff --git a/support/node-websocket-client/lib/websocket.js b/support/node-websocket-client/lib/websocket.js
index 32dd79be26..810d5a32ce 100644
--- a/support/node-websocket-client/lib/websocket.js
+++ b/support/node-websocket-client/lib/websocket.js
@@ -494,6 +494,13 @@ var WebSocket = function(url, proto, opts) {
             return function(req, s, head) {
                 stream = s;
 
+                if (readyState == CLOSED) {
+                    stream.end();
+                    stream.destroy();
+                    stream = undefined;
+                    return;
+                }
+
                 stream.on('data', function(d) {
                     if (d.length <= 0) {
                         return;
diff --git a/test/common.js b/test/common.js
index 425651d058..1b5b9d3198 100644
--- a/test/common.js
+++ b/test/common.js
@@ -179,7 +179,6 @@ client = function (port) {
  */
 
 create = function (cl) {
-  console.log('');
   var manager = io.listen(cl.port);
   manager.set('client store expiration', 0);
   return manager;
diff --git a/test/transports.flashsocket.test.js b/test/transports.flashsocket.test.js
index dc08b17ec8..e857be3174 100644
--- a/test/transports.flashsocket.test.js
+++ b/test/transports.flashsocket.test.js
@@ -168,13 +168,18 @@ module.exports = {
   'flashsocket identifies as flashsocket': function (done) {
     var cl = client(++ports)
       , io = create(cl)
-      , messages = 0
       , ws;
+
     io.set('transports', ['flashsocket']);
     io.sockets.on('connection', function (socket) {
       socket.manager.transports[socket.id].name.should.equal('flashsocket');
+      ws.finishClose();
+      cl.end();
+      io.flashPolicyServer.close();
+      io.server.close();
       done();
     });
+
     cl.handshake(function (sid) {
       ws = websocket(cl, sid, 'flashsocket');
     });
diff --git a/test/transports.websocket.test.js b/test/transports.websocket.test.js
index 63fedd6d58..5ea59ca0a0 100644
--- a/test/transports.websocket.test.js
+++ b/test/transports.websocket.test.js
@@ -19,7 +19,24 @@ var sio = require('socket.io')
  */
 
 module.exports = {
-
+  'websocket identifies as websocket': function (done) {
+    var cl = client(++ports)
+      , io = create(cl)
+      , ws;
+      
+    io.set('transports', ['websocket']);
+    io.sockets.on('connection', function (socket) {
+      socket.manager.transports[socket.id].name.should.equal('websocket');
+      ws.finishClose();
+      cl.end();
+      io.server.close();
+      done();
+    });
+    cl.handshake(function (sid) {
+      ws = websocket(cl, sid);
+    });
+  },    	
+  
   'default websocket draft parser is used for unknown sec-websocket-version': function (done) {
     var cl = client(++ports)
       , io = create(cl)
@@ -28,17 +45,10 @@ module.exports = {
     io.set('transports', ['websocket']);
     io.sockets.on('connection', function (socket) {
       socket.manager.transports[socket.id].protocolVersion.should.equal('hixie-76');
-
-      socket.on('disconnect', function () {
-        setTimeout(function () {
-          ws.finishClose();
-          cl.end();
-          io.server.close();
-          done();
-        }, 10);
-      });
-
-      socket.disconnect();
+      ws.finishClose();
+      cl.end();
+      io.server.close();
+      done();
     });
 
     cl.handshake(function (sid) {
@@ -48,22 +58,14 @@ module.exports = {
 
   'hybi-07-12 websocket draft parser is used for sec-websocket-version: 8': function (done) {
     var cl = client(++ports)
-      , io = create(cl)
-      , ws;
+      , io = create(cl);
 
     io.set('transports', ['websocket']);
     io.sockets.on('connection', function (socket) {
       socket.manager.transports[socket.id].protocolVersion.should.equal('07-12');
-
-      socket.on('disconnect', function () {
-        setTimeout(function () {
-          cl.end();
-          io.server.close();
-          done();
-        }, 10);
-      });
-
-      socket.disconnect();
+      cl.end();
+      io.server.close();
+      done();
     });
 
     var headers = {
@@ -87,16 +89,9 @@ module.exports = {
 
     io.sockets.on('connection', function (socket) {
       socket.manager.transports[socket.id].protocolVersion.should.equal('16');
-
-      socket.on('disconnect', function () {
-        setTimeout(function () {
-          cl.end();
-          io.server.close();
-          done();
-        }, 10);
-      });
-
-      socket.disconnect();
+      cl.end();
+      io.server.close();
+      done();
     });
 
     var headers = {
@@ -131,10 +126,9 @@ module.exports = {
       var sid = data.split(':')[0];
       var url = '/socket.io/' + sio.protocol + '/websocket/' + sid;
       cl.get(url, {headers: headers}, function (res, data) {});
-      res.client.onend = function() {
-        io.server.close();
-        done();
-      }
+      cl.end();
+      io.server.close();
+      done();
     });
   },
 
@@ -157,10 +151,9 @@ module.exports = {
       var sid = data.split(':')[0];
       var url = '/socket.io/' + sio.protocol + '/websocket/' + sid;
       cl.get(url, {headers: headers}, function (res, data) {});
-      res.client.onend = function() {
-        io.server.close();
-        done();
-      }
+      cl.end();
+      io.server.close();
+      done();
     });
   },