diff -r f6d73c8756e2 -r 4c6053a6b17d tests/run-tests.py
--- a/tests/run-tests.py	Thu Jan 21 21:15:52 2016 +0000
+++ b/tests/run-tests.py	Thu Jan 21 12:37:12 2016 -0800
@@ -1526,13 +1526,13 @@
             channels[channel] = "=" + test.name[5:].split(".")[0]
             try:
                 test(result)
+                channels[channel] = ''
                 done.put(None)
             except KeyboardInterrupt:
-                pass
+                channels[channel] = ''
             except: # re-raises
                 done.put(('!', test, 'run-test raised an error, see traceback'))
                 raise
-            channels[channel] = ''
 
         def stat():
             count = 0