diff --git a/ChangeLog b/ChangeLog
index 6afff2d11e..b39c0393c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-27  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/tst-tls13.c (do_test): Avoid using the library path when
+	looking for tst-tlsmod13a.so.
+
 	* stdio-common/tstdiomisc.c: If FLT_EVEL_METHOD is 2 use long
 	double math to generate NaN results.
 
diff --git a/elf/tst-tls13.c b/elf/tst-tls13.c
index 55fb62e540..06bfbacb5c 100644
--- a/elf/tst-tls13.c
+++ b/elf/tst-tls13.c
@@ -2,17 +2,17 @@
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 
 static int
 do_test (void)
 {
-  int i;
-  for (i = 0; i < 1000;)
+  for (int i = 0; i < 1000;)
     {
       printf ("round %d\n",++i);
 
-      void *h = dlopen ("tst-tlsmod13a.so", RTLD_LAZY);
+      void *h = dlopen ("$ORIGIN/tst-tlsmod13a.so", RTLD_LAZY);
       if (h == NULL)
 	{
 	  printf ("cannot load: %s\n", dlerror ());