diff --git a/src/server.js b/src/server.js
index c76847f..cb8ac50 100644
--- a/src/server.js
+++ b/src/server.js
@@ -25,6 +25,7 @@ Server.prototype.listen = function(port, host) {
     var client = new Client(true);
     client._end = client.end;
     client.end = function end(endReason) {
+      endReason='{"text":"'+endReason+'"}';
       if(client.state === states.PLAY) {
         client.write('kick_disconnect', {reason: endReason});
       } else if(client.state === states.LOGIN) {
diff --git a/test/test.js b/test/test.js
index c3bc867..e2bfa04 100644
--- a/test/test.js
+++ b/test/test.js
@@ -439,7 +439,7 @@ describe("client", function() {
       });
       var gotKicked = false;
       client.on([states.LOGIN, 0x00], function(packet) {
-        assert.strictEqual(packet.reason, '"Failed to verify username!"');
+        assert.ok(packet.reason.indexOf('"Failed to verify username!"')!=-1);
         gotKicked = true;
       });
       client.on('end', function() {
@@ -498,7 +498,7 @@ describe("mc-server", function() {
     var count = 2;
     server.on('connection', function(client) {
       client.on('end', function(reason) {
-        assert.strictEqual(reason, "LoginTimeout");
+        assert.strictEqual(reason, '{"text":"LoginTimeout"}');
         server.close();
       });
     });
@@ -527,7 +527,7 @@ describe("mc-server", function() {
     var count = 2;
     server.on('connection', function(client) {
       client.on('end', function(reason) {
-        assert.strictEqual(reason, "KeepAliveTimeout");
+        assert.strictEqual(reason, '{"text":"KeepAliveTimeout"}');
         server.close();
       });
     });
@@ -682,7 +682,7 @@ describe("mc-server", function() {
     var count = 2;
     server.on('login', function(client) {
       client.on('end', function(reason) {
-        assert.strictEqual(reason, 'ServerShutdown');
+        assert.strictEqual(reason, '{"text":"ServerShutdown"}');
         resolve();
       });
       client.write('login', {