diff --git a/tests/sshserver.py b/tests/sshserver.py
index c5545c5..72a6884 100644
--- a/tests/sshserver.py
+++ b/tests/sshserver.py
@@ -51,7 +51,7 @@ class Server(paramiko.ServerInterface):
             b'UWT10hcuO4Ks8=')
     good_pub_key = paramiko.RSAKey(data=decodebytes(data))
 
-    encodings = ['UTF-8', 'GBK']
+    encodings = ['UTF-8', 'GBK', 'UTF-8\r\n', 'GBK\r\n']
 
     def __init__(self):
         self.shell_event = threading.Event()
@@ -146,7 +146,7 @@ def run_ssh_server(port=2200, running=True):
 
         # chan.send('\r\n\r\nWelcome!\r\n\r\n')
         print(server.encoding)
-        chan.send(banner.encode(server.encoding))
+        chan.send(banner.encode(server.encoding.strip()))
         if username == 'bar':
             msg = chan.recv(1024)
             chan.send(msg)
diff --git a/webssh/handler.py b/webssh/handler.py
index c29740a..fe4ab1d 100644
--- a/webssh/handler.py
+++ b/webssh/handler.py
@@ -173,7 +173,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
         except paramiko.SSHException:
             result = None
         else:
-            result = to_str(stdout.read())
+            result = to_str(stdout.read().strip())
 
         return result if result else 'utf-8'