diff --git a/.travis.yml b/.travis.yml
index 91e60a7d..6d0962a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,10 @@ jobs:
     - stage: test
       python: '3.6'
     - stage: test
-      python: '3.7'
+      python: '3.7' 
+    - stage: test
+      python: 'pypy3'
+      dist: xenial
     - stage: test
       python: '3.8'
     - stage: coverage
diff --git a/tests/testserver/server.py b/tests/testserver/server.py
index 6a1dcaa5..132221f7 100644
--- a/tests/testserver/server.py
+++ b/tests/testserver/server.py
@@ -96,6 +96,7 @@ class Server(threading.Thread):
             handler_result = self.handler(sock)
 
             self.handler_results.append(handler_result)
+            sock.close()
 
     def _accept_connection(self):
         try: