diff --git a/ChangeLog b/ChangeLog
index 3636af0ed6..37cd69037a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf/Makefile (tests-static-internal): Add
+	tst-tls1-static-non-pie.
+	(LDFLAGS-tst-tls1-static-non-pie): New.
+	* elf/tst-tls1-static-non-pie.c: New file.
+
 2017-09-29  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/ieee754/dbl-64/s_asinh.c: Include <libm-alias-double.h>.
diff --git a/elf/Makefile b/elf/Makefile
index e21f37e30b..c6edebd4ee 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -149,7 +149,10 @@ tests-static-normal := tst-leaks1-static tst-array1-static tst-array5-static \
 	       tst-tlsalign-static tst-tlsalign-extern-static \
 	       tst-linkall-static tst-env-setuid tst-env-setuid-tunables
 tests-static-internal := tst-tls1-static tst-tls2-static \
-	       tst-ptrguard1-static tst-stackguard1-static
+	       tst-ptrguard1-static tst-stackguard1-static \
+	       tst-tls1-static-non-pie
+
+LDFLAGS-tst-tls1-static-non-pie = $(no-pie-ldflag)
 
 tests := tst-tls9 tst-leaks1 \
 	tst-array1 tst-array2 tst-array3 tst-array4 tst-array5 \
diff --git a/elf/tst-tls1-static-non-pie.c b/elf/tst-tls1-static-non-pie.c
new file mode 100644
index 0000000000..a01008073b
--- /dev/null
+++ b/elf/tst-tls1-static-non-pie.c
@@ -0,0 +1 @@
+#include "tst-tls1.c"