diff --git a/ChangeLog b/ChangeLog
index 613db927a3..33caac763c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf/Makefile (tests): Add vismain only if
+	$(have-protected-data) == yes.
+	(tests-pie): Likewise.
+
 2017-08-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #21871]
diff --git a/elf/Makefile b/elf/Makefile
index e758a4c960..2956445de8 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -289,10 +289,12 @@ ifeq (yesyes,$(have-fpie)$(build-shared))
 modules-names += tst-piemod1
 tests += tst-pie1 tst-pie2
 tests-pie += tst-pie1 tst-pie2
+ifeq (yes,$(have-protected-data))
 tests += vismain
 tests-pie += vismain
 CFLAGS-vismain.c = $(PIE-ccflag)
 endif
+endif
 modules-execstack-yes = tst-execstack-mod
 extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))