diff --git a/test b/test
index 9340afe..a21017d 100755
--- a/test
+++ b/test
@@ -68,8 +68,13 @@ cleanup() {
 	done
 }
 
+ctrl-c() {
+	exitonerror=1
+}
+
 do_setup() {
-  trap cleanup 0 1 2 3 15
+  trap cleanup 0 1 3 15
+  trap ctrl-c 2
 
   devlist=
   for d in 0 1 2 3 4 5 6 7 8 9 10 11 12