diff --git a/ChangeLog b/ChangeLog
index 27ebce73bb..0d3f7781fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* Rules [$(run-built-tests) = no] (tests): Do not depend on
+	$(tests-unsupported).
+
 2016-11-04  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/unix/sysv/linux/sparc/bits/wordsize.h
diff --git a/Rules b/Rules
index 342d659408..4b95997a06 100644
--- a/Rules
+++ b/Rules
@@ -114,7 +114,8 @@ else
 others: $(addprefix $(objpfx),$(extra-objs))
 endif
 ifeq ($(run-built-tests),no)
-tests: $(addprefix $(objpfx),$(tests) $(test-srcs)) $(tests-special)
+tests: $(addprefix $(objpfx),$(filter-out $(tests-unsupported),$(tests)) \
+			     $(test-srcs)) $(tests-special)
 xtests: tests $(xtests-special)
 else
 tests: $(tests:%=$(objpfx)%.out) $(tests-special)