diff --git a/llvm/test/tools/llvm-debuginfod-find/debuginfod.test b/llvm/test/tools/llvm-debuginfod-find/debuginfod.test
index d1c9c693c0e4..798f6f3c8ee6 100644
--- a/llvm/test/tools/llvm-debuginfod-find/debuginfod.test
+++ b/llvm/test/tools/llvm-debuginfod-find/debuginfod.test
@@ -2,13 +2,13 @@
 # RUN: rm -rf %t
 # RUN: mkdir %t
 # # Query the python server for artifacts
-# RUN: DEBUGINFOD_CACHE_PATH=%t %python %s --server-path %S/Inputs \
+# RUN: env DEBUGINFOD_CACHE_PATH=%t %python %s --server-path %S/Inputs \
 # RUN:   --tool-cmd 'llvm-debuginfod-find --dump --executable abcdef' | \
 # RUN:   FileCheck %s --check-prefix=EXECUTABLE
-# RUN: DEBUGINFOD_CACHE_PATH=%t %python %s --server-path %S/Inputs \
+# RUN: env DEBUGINFOD_CACHE_PATH=%t %python %s --server-path %S/Inputs \
 # RUN:   --tool-cmd 'llvm-debuginfod-find --dump --source=/directory/file.c abcdef' | \
 # RUN:   FileCheck %s --check-prefix=SOURCE
-# RUN: DEBUGINFOD_CACHE_PATH=%t %python %s --server-path %S/Inputs \
+# RUN: env DEBUGINFOD_CACHE_PATH=%t %python %s --server-path %S/Inputs \
 # RUN:   --tool-cmd 'llvm-debuginfod-find --dump --debuginfo abcdef' | \
 # RUN:   FileCheck %s --check-prefix=DEBUGINFO
 
@@ -18,12 +18,12 @@
 
 # # The artifacts should still be present in the cache without needing to query
 # # the server.
-# RUN: DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump --executable abcdef | \
+# RUN: env DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump --executable abcdef | \
 # RUN:   FileCheck %s --check-prefix=EXECUTABLE
-# RUN: DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump \
+# RUN: env DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump \
 # RUN:   --source=/directory/file.c abcdef | \
 # RUN:   FileCheck %s --check-prefix=SOURCE
-# RUN: DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump --debuginfo abcdef | \
+# RUN: env DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump --debuginfo abcdef | \
 # RUN:   FileCheck %s --check-prefix=DEBUGINFO