diff --git a/ChangeLog b/ChangeLog
index 0d3f7781fb..7f2493bc57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2016-11-04  Joseph Myers  <joseph@codesourcery.com>
 
+	* Rules (tests-expected): New variable, depending on
+	$(run-built-tests).
+	(tests): Pass $(tests-expected) to merge-test-results.sh, not
+	$(tests).
+
 	* Rules [$(run-built-tests) = no] (tests): Do not depend on
 	$(tests-unsupported).
 
diff --git a/Rules b/Rules
index 4b95997a06..466db076f0 100644
--- a/Rules
+++ b/Rules
@@ -124,9 +124,14 @@ endif
 
 tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
 xtests-special-notdir = $(patsubst $(objpfx)%, %, $(xtests-special))
+ifeq ($(run-built-tests),no)
+tests-expected =
+else
+tests-expected = $(tests)
+endif
 tests:
 	$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
-	  $(sort $(tests) $(tests-special-notdir:.out=)) \
+	  $(sort $(tests-expected) $(tests-special-notdir:.out=)) \
 	  > $(objpfx)subdir-tests.sum
 xtests:
 	$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \