diff --git a/lldb/test/Shell/Commands/command-target-create-resolve-exe.test b/lldb/test/Shell/Commands/command-target-create-resolve-exe.test
index 1664a45fd32a..0ebbaf25e652 100644
--- a/lldb/test/Shell/Commands/command-target-create-resolve-exe.test
+++ b/lldb/test/Shell/Commands/command-target-create-resolve-exe.test
@@ -12,10 +12,10 @@
 # RUN: %lldb %t.dir/testmain.exe -b | FileCheck %s
 
 ## Test with exe on path, with .exe suffix
-# RUN: env PATH="%t.dir;$PATH" %lldb testmain.exe -b | FileCheck %s
+# RUN: env PATH="%t.dir%{pathsep}%{PATH}" %lldb testmain.exe -b | FileCheck %s
 
 ## Test with exe on path, without .exe suffix
-# RUN: env PATH="%t.dir;$PATH" %lldb testmain -b | FileCheck %s
+# RUN: env PATH="%t.dir%{pathsep}%{PATH}" %lldb testmain -b | FileCheck %s
 
 ## Test in cwd, with .exe suffix
 # RUN: cd "%t.dir" && %lldb testmain.exe -b | FileCheck %s
diff --git a/lldb/test/Shell/Commands/lit.local.cfg b/lldb/test/Shell/Commands/lit.local.cfg
index 60e87e4624e5..b83eee443fcc 100644
--- a/lldb/test/Shell/Commands/lit.local.cfg
+++ b/lldb/test/Shell/Commands/lit.local.cfg
@@ -1 +1,4 @@
 config.suffixes = ['.s', '.test', '.yaml']
+
+# This is needed by command-target-create-resolve-exe.test
+config.substitutions.append(('%{PATH}', config.environment['PATH']))