diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 491743f5194..cba20368e21 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-02  Yao Qi  <yao.qi@linaro.org>
+
+	* gdb.threads/no-unwaited-for-left.exp: Set up kfail if target
+	is remote.
+
 2015-04-02  Gary Benson <gbenson@redhat.com>
 
 	* gdb.base/break-probes.exp: Cope with "target:" sysroot.
diff --git a/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp b/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
index 518301e7bcc..3a43d58b45e 100644
--- a/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
+++ b/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
@@ -37,6 +37,9 @@ gdb_test_no_output "set scheduler-locking on" \
     "enable scheduler-locking, for thread 2"
 
 # Continue.  Thread 2 exits, and the main thread was already stopped.
+if [is_remote target] {
+    setup_kfail "gdb/14618" "*-*-*"
+}
 gdb_test "continue" \
     "No unwaited-for children left." \
     "continue stops when thread 2 exits"
@@ -58,6 +61,9 @@ gdb_continue_to_breakpoint "break-here-2" ".* break-here-2 .*"
 gdb_test_no_output "set scheduler-locking on" \
     "enable scheduler-locking, for main thread"
 # The main thread exits, and thread 3 was already stopped.
+if [is_remote target] {
+    setup_kfail "gdb/14618" "*-*-*"
+}
 gdb_test "continue" \
     "No unwaited-for children left." \
     "continue stops when the main thread exits"