diff --git a/ChangeLog b/ChangeLog
index 3ccfd2c3c0..143d4a65bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-03-04  Roland McGrath  <roland@hack.frob.com>
 
+	* Makefile (tests-special): Add $(objpfx)c++-types-check.out only
+	inside conditional for nonempty $(CXX).
+
 	* math/Makefile (tests): Add test-math-isinff only if $(CXX) is
 	nonempty.
 
diff --git a/Makefile b/Makefile
index 9c6918d995..0732d48601 100644
--- a/Makefile
+++ b/Makefile
@@ -251,16 +251,16 @@ mostlyclean: parent-mostlyclean
 tests-clean:
 	@$(MAKE) subdir_testclean no_deps=t
 
-tests-special += $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
-
 ifneq (,$(CXX))
 vpath c++-types.data $(+sysdep_dirs)
 
+tests-special += $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
 $(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh
 	scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu11 $(+gccwarn-c),$(CFLAGS)) $(CPPFLAGS) > $@; \
 	$(evaluate-test)
 endif
 
+tests-special += $(objpfx)check-local-headers.out
 $(objpfx)check-local-headers.out: scripts/check-local-headers.sh
 	AWK='$(AWK)' scripts/check-local-headers.sh \
 	  "$(includedir)" "$(objpfx)" < /dev/null > $@; \