diff --git a/llvm/examples/OrcV2Examples/LLJITWithRemoteDebugging/LLJITWithRemoteDebugging.cpp b/llvm/examples/OrcV2Examples/LLJITWithRemoteDebugging/LLJITWithRemoteDebugging.cpp
index 6da30f6082062..ca0953550e090 100644
--- a/llvm/examples/OrcV2Examples/LLJITWithRemoteDebugging/LLJITWithRemoteDebugging.cpp
+++ b/llvm/examples/OrcV2Examples/LLJITWithRemoteDebugging/LLJITWithRemoteDebugging.cpp
@@ -243,7 +243,7 @@ int main(int argc, char *argv[]) {
     outs() << "Running: main(";
     int Pos = 0;
     for (const std::string &Arg : InputArgv)
-      outs() << (Pos++ == 0 ? "" : ", ") << Arg;
+      outs() << (Pos++ == 0 ? "" : ", ") << "\"" << Arg << "\"";
     outs() << ")\n";
 
     // Execute the code in the remote target process and dump the result. With
diff --git a/llvm/test/Examples/OrcV2Examples/lljit-with-remote-debugging.test b/llvm/test/Examples/OrcV2Examples/lljit-with-remote-debugging.test
index a9c3946b55e2c..a1ea7f9db1fd0 100644
--- a/llvm/test/Examples/OrcV2Examples/lljit-with-remote-debugging.test
+++ b/llvm/test/Examples/OrcV2Examples/lljit-with-remote-debugging.test
@@ -1,10 +1,12 @@
 # This test makes sure that the example builds and executes as expected.
 # Instructions for debugging can be found in LLJITWithRemoteDebugging.cpp
 
-# RUN: LLJITWithRemoteDebugging %p/Inputs/argc_sub1_elf.ll
-# CHECK: Running: {{.*}}/Inputs/argc_sub1_elf.ll
-# CHECK: Exit code: 0
+# RUN: LLJITWithRemoteDebugging %p/Inputs/argc_sub1_elf.ll | FileCheck --check-prefix=CHECK1 %s
+# CHECK1: Parsing input IR code from: {{.*}}/Inputs/argc_sub1_elf.ll
+# CHECK1: Running: main()
+# CHECK1: Exit code: 0
 
-# RUN: LLJITWithRemoteDebugging %p/Inputs/argc_sub1_elf.ll --args 2nd 3rd 4th
-# CHECK: Running: {{.*}}/Inputs/argc_sub1_elf.ll 2nd 3rd 4th
-# CHECK: Exit code: 3
+# RUN: LLJITWithRemoteDebugging %p/Inputs/argc_sub1_elf.ll --args 2nd 3rd 4th | FileCheck --check-prefix=CHECK3 %s
+# CHECK3: Parsing input IR code from: {{.*}}/Inputs/argc_sub1_elf.ll
+# CHECK3: Running: main("2nd", "3rd", "4th")
+# CHECK3: Exit code: 3