diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 079814aae0f..3200c349fa2 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-04  Simon Marchi  <simon.marchi@efficios.com>
+
+	* gdb.server/stop-reply-no-thread.exp: Use build_executable
+	instead of prepare_for_testing.
+
 2021-01-04  Simon Marchi  <simon.marchi@efficios.com>
 
 	* gdb.server/solib-list.exp: Use clean_restart.
diff --git a/gdb/testsuite/gdb.server/stop-reply-no-thread.exp b/gdb/testsuite/gdb.server/stop-reply-no-thread.exp
index ea82780996b..5e93b4770aa 100644
--- a/gdb/testsuite/gdb.server/stop-reply-no-thread.exp
+++ b/gdb/testsuite/gdb.server/stop-reply-no-thread.exp
@@ -28,7 +28,7 @@ if { [skip_gdbserver_tests] } {
 }
 
 standard_testfile
-if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
+if { [build_executable "failed to prepare" $testfile $srcfile] == -1 } {
     return -1
 }