diff --git a/docs/drivers/asahi.rst b/docs/drivers/asahi.rst
index 98620f8c790..0c34a24a63b 100644
--- a/docs/drivers/asahi.rst
+++ b/docs/drivers/asahi.rst
@@ -315,7 +315,7 @@ with the IR:
 
 .. code-block:: sh
 
-   ~/shader-db$ AGX_MESA_DEBUG=shaders,shaderdb ASAHI_MESA_DEBUG=precompile LIBGL_DRIVERS_PATH=~/lib/dri/ LD_PRELOAD=~/mesa/build/src/asahi/drm-shim/libasahi_noop_drm_shim.so ./run shaders/glmark/1-12.shader_test
+   ~/shader-db$ AGX_MESA_DEBUG=shaders,shaderdb ASAHI_MESA_DEBUG=precompile LD_PRELOAD=~/mesa/build/src/asahi/drm-shim/libasahi_noop_drm_shim.so ./run shaders/glmark/1-12.shader_test
 
 The drm-shim implementation for Asahi is located in ``src/asahi/drm-shim``. The
 drm-shim implementation there should be updated as new UABI is added.
diff --git a/docs/drivers/panfrost/drm-shim.rst b/docs/drivers/panfrost/drm-shim.rst
index 874ac37c2f9..1c4d0bc6cb1 100644
--- a/docs/drivers/panfrost/drm-shim.rst
+++ b/docs/drivers/panfrost/drm-shim.rst
@@ -18,9 +18,7 @@ To build Mesa with Panfrost drm-shim, configure Meson with
 building section for a full invocation. The drm-shim binary will be built to
 ``build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so``.
 
-To use, set the ``LD_PRELOAD`` environment variable to the drm-shim binary.  It
-may also be necessary to set ``LIBGL_DRIVERS_PATH`` to the location where Mesa
-was installed.
+To use, set the ``LD_PRELOAD`` environment variable to the drm-shim binary.
 
 By default, drm-shim mocks a Mali-G52 system. To select a specific Mali GPU,
 set the ``PAN_GPU_ID`` environment variable to the desired GPU ID:
@@ -45,7 +43,6 @@ build directory is ``~/mesa/build``, a shader can be compiled for Mali-G52 as:
 .. code-block:: sh
 
    ~/shader-db$ BIFROST_MESA_DEBUG=shaders \
-   LIBGL_DRIVERS_PATH=~/lib/dri/ \
    LD_PRELOAD=~/mesa/build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so \
    PAN_GPU_ID=7212 \
    ./run shaders/glmark/1-1.shader_test
@@ -55,7 +52,6 @@ The same shader can be compiled for Mali-T720 as:
 .. code-block:: sh
 
    ~/shader-db$ MIDGARD_MESA_DEBUG=shaders \
-   LIBGL_DRIVERS_PATH=~/lib/dri/ \
    LD_PRELOAD=~/mesa/build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so \
    PAN_GPU_ID=720 \
    ./run shaders/glmark/1-1.shader_test
@@ -75,7 +71,6 @@ although it requires a specially built CTS:
 .. code-block:: sh
 
    ~/VK-GL-CTS/build/external/openglcts/modules$ PAN_MESA_DEBUG=trace,dump \
-   LIBGL_DRIVERS_PATH=~/lib/dri/ \
    LD_PRELOAD=~/mesa/build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so \
    PAN_GPU_ID=7212 EGL_PLATFORM=surfaceless \
    ./glcts --deqp-surface-type=pbuffer \
diff --git a/docs/envvars.rst b/docs/envvars.rst
index f9ca4eca2f0..2625571f09f 100644
--- a/docs/envvars.rst
+++ b/docs/envvars.rst
@@ -13,10 +13,6 @@ LibGL environment variables
    If defined debug information will be printed to stderr. If set to
    ``verbose`` additional information will be printed.
 
-.. envvar:: LIBGL_DRIVERS_PATH
-
-   colon-separated list of paths to search for DRI drivers
-
 .. envvar:: LIBGL_ALWAYS_INDIRECT
 
    if set to ``true``, forces an indirect rendering context/connection.
diff --git a/docs/meson.rst b/docs/meson.rst
index ca286b02f87..2f35a0b5be8 100644
--- a/docs/meson.rst
+++ b/docs/meson.rst
@@ -248,8 +248,8 @@ option. For example:
    meson --prefix="${PWD}/build/install" build/
 
 will put the final libraries and drivers into the build/install/
-directory. Then you can set LD_LIBRARY_PATH and LIBGL_DRIVERS_PATH to
-that location to run/test the driver.
+directory. Then you can set LD_LIBRARY_PATH to that location to run/test
+the driver.
 
 Meson also honors ``DESTDIR`` for installs.
 
diff --git a/docs/releasing.rst b/docs/releasing.rst
index 668a59e04c9..f27b056fcb8 100644
--- a/docs/releasing.rst
+++ b/docs/releasing.rst
@@ -262,7 +262,6 @@ Here is one solution:
    __es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"'
    test "x$LD_LIBRARY_PATH" != 'x' && __old_ld="$LD_LIBRARY_PATH"
    export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/:"${__old_ld}"
-   export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
    export LIBGL_DEBUG=verbose
    eval $__glxinfo_cmd
    eval $__glxgears_cmd
@@ -282,7 +281,6 @@ Here is one solution:
    # Smoke test DOTA2
    unset LD_LIBRARY_PATH
    test "x$__old_ld" != 'x' && export LD_LIBRARY_PATH="$__old_ld" && unset __old_ld
-   unset LIBGL_DRIVERS_PATH
    unset LIBGL_DEBUG
    unset LIBGL_ALWAYS_SOFTWARE
    unset GALLIUM_DRIVER