diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e177884976a..1aeb785131a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-08  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	PR gdb/22841
+	* boards/gdbserver-base.exp (${board}_file, ${board}_download,
+	${board}_upload): Remove.
+
 2018-03-07  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* gdb.cp/watch-cp.cc: New test.
diff --git a/gdb/testsuite/boards/gdbserver-base.exp b/gdb/testsuite/boards/gdbserver-base.exp
index 2e9769795ef..52ad698b3f9 100644
--- a/gdb/testsuite/boards/gdbserver-base.exp
+++ b/gdb/testsuite/boards/gdbserver-base.exp
@@ -32,25 +32,3 @@ set_board_info gdb,nofileio 1
 set_board_info gdb,predefined_tsv "\\\$trace_timestamp"
 
 set GDBFLAGS "${GDBFLAGS} -ex \"set auto-connect-native-target off\""
-
-proc ${board}_file { dest op args } {
-    if { $op == "delete" } {
-	return 0
-    }
-    return [eval [list standard_file $dest $op] $args]
-}
-
-proc ${board}_download { board host dest } {
-    # We pass DEST in standard_output_file, regardless of whether it is absolute
-    # or relative, because we don't want the tests to be able to write outside
-    # their standard output directory.
-    set dest [standard_output_file $dest]
-
-    file copy -force $host $dest
-
-    return $dest
-}
-
-proc ${board}_upload {dest srcfile args} {
-    return $srcfile
-}