diff --git a/maint/test/websocket/client.py b/maint/test/websocket/client.py
index f549b218..16798879 100644
--- a/maint/test/websocket/client.py
+++ b/maint/test/websocket/client.py
@@ -11,7 +11,7 @@ define('servers', type=str, multiple=True,
 define('cases', type=str, multiple=True,
        default=["*"])
 define('exclude', type=str, multiple=True,
-       default=[])
+       default=["9.*"])
 
 if __name__ == '__main__':
    parse_command_line()
diff --git a/maint/test/websocket/run.sh b/maint/test/websocket/run.sh
index d1187015..9478687d 100755
--- a/maint/test/websocket/run.sh
+++ b/maint/test/websocket/run.sh
@@ -4,8 +4,8 @@
 # python2 and python3.  Output goes in ./reports/servers/index.html.
 #
 # The --cases and --exclude arguments can be used to run only part of
-# the suite.  --exclude="9.*" is useful to skip the relatively slow
-# performance tests.
+# the suite.  The default is --exclude="9.*" to skip the relatively slow
+# performance tests; pass --exclude="" to override and include them.
 
 set -e
 
@@ -21,13 +21,17 @@ PY27_SERVER_PID=$!
 .tox/py32/bin/python server.py --port=9003 &
 PY32_SERVER_PID=$!
 
+.tox/pypy/bin/python server.py --port=9004 &
+PYPY_SERVER_PID=$!
+
 sleep 1
 
-.tox/py27/bin/python ./client.py --servers=Tornado/py25=ws://localhost:9001,Tornado/py27=ws://localhost:9002,Tornado/py32=ws://localhost:9003 "$@"
+.tox/py27/bin/python ./client.py --servers=Tornado/py25=ws://localhost:9001,Tornado/py27=ws://localhost:9002,Tornado/py32=ws://localhost:9003,Tornado/pypy=ws://localhost:9004 "$@" || true
 
 kill $PY25_SERVER_PID
 kill $PY27_SERVER_PID
 kill $PY32_SERVER_PID
+kill $PYPY_SERVER_PID
 wait
 
 echo "Tests complete. Output is in ./reports/servers/index.html"
\ No newline at end of file
diff --git a/maint/test/websocket/server.py b/maint/test/websocket/server.py
index 83e2da61..b44056cd 100644
--- a/maint/test/websocket/server.py
+++ b/maint/test/websocket/server.py
@@ -17,5 +17,5 @@ if __name__ == '__main__':
     app = Application([
             ('/', EchoHandler),
             ])
-    app.listen(options.port, address='localhost')
+    app.listen(options.port, address='127.0.0.1')
     IOLoop.instance().start()
diff --git a/maint/test/websocket/tox.ini b/maint/test/websocket/tox.ini
index 7b374a48..0709749f 100644
--- a/maint/test/websocket/tox.ini
+++ b/maint/test/websocket/tox.ini
@@ -2,7 +2,7 @@
 # to install autobahn and deal with 2to3 for the python3 version.
 # See run.sh for the real test runner.
 [tox]
-envlist = py27, py32, py25
+envlist = py27, py32, py25, pypy
 setupdir=../../..
 
 [testenv]