diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6d10953d705..43758c959fe 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-10  Simon Marchi  <simon.marchi@efficios.com>
+
+	* gdb.multi/multi-target.exp.tcl (setup): Add "set sysroot" to
+	GDBFLAGS.
+
 2021-02-10  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.fortran/lbound-ubound.F90: New file.
diff --git a/gdb/testsuite/gdb.multi/multi-target.exp.tcl b/gdb/testsuite/gdb.multi/multi-target.exp.tcl
index 53727bb6ed1..6f3051c6b27 100644
--- a/gdb/testsuite/gdb.multi/multi-target.exp.tcl
+++ b/gdb/testsuite/gdb.multi/multi-target.exp.tcl
@@ -109,7 +109,13 @@ proc setup {non-stop} {
     global binfile
 
     cleanup_gdbservers
-    clean_restart ${binfile}
+
+    save_vars { ::GDBFLAGS } {
+	# Make GDB read files from the local file system, not through the
+	# remote targets.
+	set ::GDBFLAGS "${::GDBFLAGS} -ex \"set sysroot\""
+	clean_restart ${binfile}
+    }
 
     # multi-target depends on target running in non-stop mode.  Force
     # it on for remote targets, until this is the default.