diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a39a9d54dbe..4eb7b4ef3a7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-06  Yvan Roux  <yvan.roux@linaro.org>
+	    Pedro Alves  <palves@redhat.com>
+
+	* gcc.dg/guality/guality.h (main): Avoid GDB being blocked on signals.
+
 2016-04-06  Jakub Jelinek  <jakub@redhat.com>
 
 	* lib/target-supports.exp (check_effective_target_vect_simd_clones):
diff --git a/gcc/testsuite/gcc.dg/guality/guality.h b/gcc/testsuite/gcc.dg/guality/guality.h
index 52fa706ffe3..d5867d8ba96 100644
--- a/gcc/testsuite/gcc.dg/guality/guality.h
+++ b/gcc/testsuite/gcc.dg/guality/guality.h
@@ -252,6 +252,10 @@ main (int argc, char *argv[])
       if (!guality_gdb_input
 	  || fprintf (guality_gdb_input, "\
 set height 0\n\
+handle SIGINT pass nostop\n\
+handle SIGTERM pass nostop\n\
+handle SIGSEGV pass nostop\n\
+handle SIGBUS pass nostop\n\
 attach %i\n\
 set guality_attached = 1\n\
 b %i\n\