diff --git a/ChangeLog b/ChangeLog
index 696e456957..5bbf568a27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-12  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf/Makefile (modules-names-tests): New variable.
+
 2018-09-12  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
 	* NEWS: Mention log2 improvements.
diff --git a/elf/Makefile b/elf/Makefile
index cd0771307f..4a4ca84ed1 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -274,6 +274,10 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		tst-nodelete-dlclose-dso tst-nodelete-dlclose-plugin \
 		tst-main1mod tst-libc_dlvsym-dso tst-absolute-sym-lib \
 		tst-absolute-zero-lib tst-big-note-lib
+# Most modules build with _ISOMAC defined, but those filtered out
+# depend on internal headers.
+modules-names-tests = $(filter-out ifuncmod% tst-libc_dlvsym-dso tst-tlsmod%,\
+				   $(modules-names))
 
 ifeq (yes,$(have-mtls-dialect-gnu2))
 tests += tst-gnu2-tls1