diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c16f2017f5c..cb1d8ecea10 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-30  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* gdb.base/watch-cond-infcall.exp: Don't run if target doesn't
+	support function calls from GDB.
+
 2017-05-21  Tom Tromey  <tom@tromey.com>
 
 	PR rust/21466:
diff --git a/gdb/testsuite/gdb.base/watch-cond-infcall.exp b/gdb/testsuite/gdb.base/watch-cond-infcall.exp
index c2d96699881..df3b19df05c 100644
--- a/gdb/testsuite/gdb.base/watch-cond-infcall.exp
+++ b/gdb/testsuite/gdb.base/watch-cond-infcall.exp
@@ -18,6 +18,11 @@
 
 standard_testfile
 
+if [target_info exists gdb,cannot_call_functions] {
+    unsupported "can not call functions"
+    return
+}
+
 if { [build_executable ${testfile}.exp ${testfile} ${testfile}.c {debug}] } {
     untested "failed to compile"
     return -1