diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 12ed4f90104..d1926dd7c38 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-11  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.base/completion.exp: Check file exists before running tests
+	on file completion.
+
 2014-04-10  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/cond-eval-mode.c: New file.
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 8d9eea5c093..1e152f62e45 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -105,9 +105,18 @@ gdb_test_multiple "target ctf" "" {
     }
 }
 
-foreach target_name ${targets} {
-    gdb_test "complete target ${target_name} ./gdb.base/completion" \
-	"target ${target_name} \\./gdb.base/completion.*\\./gdb.base/completion0\\.o.*\\./gdb.base/completion1\\.o.*"
+# Test artifacts are put in different locations depending on test
+# is a parallel run or not.  Firstly check file exists, and then
+# do the test on file completion.
+
+foreach dir1 [ list "./gdb.base" "./outputs/gdb.base/completion" ] {
+    if [remote_file host exists ${dir1}/completion] {
+	foreach target_name ${targets} {
+	    gdb_test "complete target ${target_name} ${dir1}/completion" \
+		"target ${target_name} ${dir1}/completion.*${dir1}/completion0\\.o.*${dir1}/completion1\\.o.*"
+	}
+	break
+    }
 }
 
 #