diff --git a/support/test-runner/app.js b/support/test-runner/app.js
index <HASH>..<HASH> 100644
--- a/support/test-runner/app.js
+++ b/support/test-runner/app.js
@@ -242,4 +242,10 @@ suite('socket.test.js', function () {
     });
   });
 
+  server('test sending query strings to the server', function (io) {
+    io.sockets.on('connection', function (socket) {
+      socket.json.send(socket.handshake);
+    })
+  });
+
 });
diff --git a/test/socket.test.js b/test/socket.test.js
index <HASH>..<HASH> 100644
--- a/test/socket.test.js
+++ b/test/socket.test.js
@@ -275,6 +275,21 @@
         socket.disconnect();
         next();
       });
+    },
+
+    'test sending query strings to the server': function (next) {
+      var socket = create('?foo=bar');
+
+      socket.on('error', function (msg) {
+        throw new Error(msg || 'Received an error');
+      });
+
+      socket.on('message', function (data) {
+        data.query.foo.should().eql('bar');
+
+        socket.disconnect();
+        next();
+      });
     }
 
   };
Added testcase for query string sending / getting