diff --git a/tests/glxenv.sh b/tests/glxenv.sh
index 7a3ed48..c6dea5c 100644
--- a/tests/glxenv.sh
+++ b/tests/glxenv.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-__GLX_VENDOR_LIBRARY_NAME=dummy
-export __GLX_VENDOR_LIBRARY_NAME
+__GLX_FORCE_VENDOR_LIBRARY_0=dummy
+export __GLX_FORCE_VENDOR_LIBRARY_0
 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$TOP_BUILDDIR/tests/dummy/.libs
 export LD_LIBRARY_PATH
diff --git a/tests/testglxgetprocaddress_genentry.sh b/tests/testglxgetprocaddress_genentry.sh
index 80922f4..aa96294 100755
--- a/tests/testglxgetprocaddress_genentry.sh
+++ b/tests/testglxgetprocaddress_genentry.sh
@@ -2,11 +2,4 @@
 
 . $TOP_SRCDIR/tests/glxenv.sh
 
-# Set __GLX_FORCE_VENDOR_LIBRARY_0 instead of __GLX_VENDOR_LIBRARY_NAME. That
-# way, it won't pre-load the vendor library, which would force it to generate
-# a dispatch stub for glXExampleExtensionFunction.
-__GLX_FORCE_VENDOR_LIBRARY_0=$__GLX_VENDOR_LIBRARY_NAME
-export __GLX_FORCE_VENDOR_LIBRARY_0
-unset __GLX_VENDOR_LIBRARY_NAME
-
 ./testglxgetprocaddress_genentry