diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5b7e94c6ef..3c51ba12d5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-29  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.base/fileio.exp: Make directories on host.
+
 2014-10-29  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.base/fileio.c (test_write): Close the file.
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index 89f0997c71..00c2b16fab 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -210,6 +210,13 @@ gdb_test continue \
 "Continuing\\..*system 4:.*OK$stop_msg" \
 "System with invalid command returns 127"
 
+# Prepare the directory for rename tests in case that test_system
+# failed to create.
+set dir1 [file join $outdir "dir1.fileio.test" "subdir.fileio.test"]
+remote_exec host "mkdir -p $dir1"
+set dir1 [file join $outdir "dir2.fileio.test"]
+remote_exec host "mkdir $dir1"
+
 gdb_test continue \
 "Continuing\\..*rename 1:.*OK$stop_msg" \
 "Rename a file"