diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4c011024757..e8afca552f1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-13  Pedro Alves  <palves@redhat.com>
+
+	* gdb.python/py-evthreads.exp: Start GDB with "set non-stop on"
+	already.
+
 2017-10-13  Pedro Alves  <palves@redhat.com>
 
 	* gdb.python/py-evsignal.exp: Check gdb_protocol instead of
diff --git a/gdb/testsuite/gdb.python/py-evthreads.exp b/gdb/testsuite/gdb.python/py-evthreads.exp
index 64b2af5fef4..31b86abf45f 100644
--- a/gdb/testsuite/gdb.python/py-evthreads.exp
+++ b/gdb/testsuite/gdb.python/py-evthreads.exp
@@ -32,14 +32,17 @@ set pyfile ${srcdir}/${subdir}/py-events.py
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     return -1
 }
-clean_restart $testfile
+
+save_vars { GDBFLAGS } {
+    append GDBFLAGS " -ex \"set non-stop on\""
+    clean_restart $testfile
+}
 
 if { [skip_python_tests] } { continue }
 
 gdb_test_no_output "source ${pyfile}" "load python file"
 
 gdb_test "test-events" "Event testers registered."
-gdb_test_no_output "set non-stop on"
 
 gdb_breakpoint "main"
 gdb_breakpoint "thread2"