diff --git a/python/sbp/client/drivers/pyserial_driver.py b/python/sbp/client/drivers/pyserial_driver.py
index db069d14ab..0ed66729be 100644
--- a/python/sbp/client/drivers/pyserial_driver.py
+++ b/python/sbp/client/drivers/pyserial_driver.py
@@ -81,6 +81,7 @@ def read(self, size):
             print()
             print("Piksi disconnected")
             print()
+            self.handle.close()
             raise IOError
 
     def write(self, s):
@@ -103,6 +104,7 @@ def write(self, s):
                 print()
                 print("Piksi disconnected")
                 print()
+                self.handle.close()
                 raise IOError
 
     def __enter__(self):
diff --git a/python/tests/sbp/client/test_driver.py b/python/tests/sbp/client/test_driver.py
index 8f8d167859..dc1072566c 100755
--- a/python/tests/sbp/client/test_driver.py
+++ b/python/tests/sbp/client/test_driver.py
@@ -30,7 +30,7 @@ class MockServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
   pass
 
 def tcp_server(handler):
-  server = MockServer(("127.0.0.1", 0), handler)
+  server = MockServer(("localhost", 0), handler)
   ip, port = server.server_address
   server_thread = threading.Thread(target=server.serve_forever)
   server_thread.daemon = True