diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ec138de66f0..4a0f3e72ebd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-18  Yao Qi  <yao.qi@linaro.org>
+
+	* selftest.c (run_tests): Don't call QUIT.  Call debug_printf
+	instead of exception_fprintf and printf_filtered.
+
 2017-08-18  Yao Qi  <yao.qi@linaro.org>
 
 	* selftest.c (register_self_test): Rename it to
diff --git a/gdb/selftest.c b/gdb/selftest.c
index 31d16af4eab..eb7728b0149 100644
--- a/gdb/selftest.c
+++ b/gdb/selftest.c
@@ -44,8 +44,6 @@ run_tests (void)
 
   for (int i = 0; i < tests.size (); ++i)
     {
-      QUIT;
-
       TRY
 	{
 	  tests[i] ();
@@ -53,7 +51,7 @@ run_tests (void)
       CATCH (ex, RETURN_MASK_ERROR)
 	{
 	  ++failed;
-	  exception_fprintf (gdb_stderr, ex, _("Self test failed: "));
+	  debug_printf ("Self test failed: %s\n", ex.message);
 	}
       END_CATCH
 
@@ -62,7 +60,7 @@ run_tests (void)
       reinit_frame_cache ();
     }
 
-  printf_filtered (_("Ran %lu unit tests, %d failed\n"),
-		   (long) tests.size (), failed);
+  debug_printf ("Ran %lu unit tests, %d failed\n",
+		(long) tests.size (), failed);
 }
 } // namespace selftests