diff --git a/ChangeLog b/ChangeLog
index 5c115bfde5..b1f769e3eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #11214]
+	* sysdeps/unix/sysv/linux/Makefile (tst-getpid2-ENV): Removed.
+
 2015-08-25  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/kernel-features.h: Define new macros.
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index bfbabd4b4b..2c67a6619f 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -193,9 +193,4 @@ endif
 
 ifeq ($(subdir),nptl)
 tests += tst-setgetname tst-align-clone tst-getpid1 tst-getpid2
-
-# In this test, we create a CLONE_VM "thread" that shares TLS storage
-# with the original thread. Both threads then race in ld.so with lazy PLT
-# resolution. Avoid this race by disabling lazy binding. BZ #11214.
-tst-getpid2-ENV = LD_BIND_NOW=1
 endif