diff --git a/run_tests b/run_tests
new file mode 100755
index 0000000..3dc0ecd
--- /dev/null
+++ b/run_tests
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+PYTHONPATH=. python t/test.py
diff --git a/tftpy/TftpStates.py b/tftpy/TftpStates.py
index 142029c..6c77499 100644
--- a/tftpy/TftpStates.py
+++ b/tftpy/TftpStates.py
@@ -156,6 +156,7 @@ class TftpContext(object):
                 continue
             break
         else:
+            self.sock.close()
             raise TftpException, "Hit max timeouts, giving up."
 
         # Ok, we've received a packet. Log it.