diff --git a/shadowsocks/local.py b/shadowsocks/local.py
index 6a97f07..994b6d8 100755
--- a/shadowsocks/local.py
+++ b/shadowsocks/local.py
@@ -68,6 +68,11 @@ def main():
             tcp_server.close(next_tick=True)
             udp_server.close(next_tick=True)
         signal.signal(getattr(signal, 'SIGQUIT', signal.SIGTERM), handler)
+
+        def int_handler(signum, _):
+            sys.exit(1)
+        signal.signal(signal.SIGINT, int_handler)
+
         loop.run()
     except (KeyboardInterrupt, IOError, OSError) as e:
         logging.error(e)
diff --git a/shadowsocks/server.py b/shadowsocks/server.py
index e7acc5e..c5a00ca 100755
--- a/shadowsocks/server.py
+++ b/shadowsocks/server.py
@@ -77,6 +77,11 @@ def main():
                      tcp_servers + udp_servers))
         signal.signal(getattr(signal, 'SIGQUIT', signal.SIGTERM),
                       child_handler)
+
+        def int_handler(signum, _):
+            sys.exit(1)
+        signal.signal(signal.SIGINT, int_handler)
+
         try:
             loop = eventloop.EventLoop()
             dns_resolver.add_to_loop(loop)
diff --git a/tests/test.py b/tests/test.py
index 5314d6e..721d484 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -138,7 +138,9 @@ try:
 finally:
     for p in [p1, p2]:
         try:
-            os.kill(p.pid, signal.SIGQUIT)
+            print('kill', file=sys.stderr)
+            os.kill(p.pid, signal.SIGINT)
+            print('waitpid', file=sys.stderr)
             os.waitpid(p.pid, 0)
         except OSError:
             pass