--- a/tests/run-tests.py	Fri Jan 22 20:32:47 2016 +0000
+++ b/tests/run-tests.py	Fri Jan 22 11:00:13 2016 -0800
@@ -1526,13 +1526,16 @@
             channels[channel] = "=" + test.name[5:].split(".")[0]
             try:
                 test(result)
-                channels[channel] = ''
                 done.put(None)
             except KeyboardInterrupt:
-                channels[channel] = ''
+                pass
             except: # re-raises
                 done.put(('!', test, 'run-test raised an error, see traceback'))
                 raise
+            try:
+                channels[channel] = ''
+            except IndexError:
+                pass
 
         def stat():
             count = 0