diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 5fdf5adcffb7c4..61971604051194 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -350,7 +350,7 @@ static vector<string> GetArgumentArray() {
 
   result.push_back("-XX:+HeapDumpOnOutOfMemoryError");
   string heap_crash_path = globals->options->output_base;
-  result.push_back("-XX:HeapDumpPath=" + ConvertPath(heap_crash_path));
+  result.push_back("-XX:HeapDumpPath=" + blaze::PathAsJvmFlag(heap_crash_path));
 
   result.push_back("-Xverify:none");
 
@@ -382,7 +382,7 @@ static vector<string> GetArgumentArray() {
         java_library_path += blaze::ListSeparator();
       }
       first = false;
-      java_library_path += blaze::ConvertPath(
+      java_library_path += blaze::PathAsJvmFlag(
           blaze_util::JoinPath(real_install_dir, blaze_util::Dirname(it)));
     }
   }
diff --git a/src/main/cpp/startup_options.cc b/src/main/cpp/startup_options.cc
index b605de36ebab30..dfa7ae41c1eaf0 100644
--- a/src/main/cpp/startup_options.cc
+++ b/src/main/cpp/startup_options.cc
@@ -399,8 +399,8 @@ void StartupOptions::AddJVMArgumentSuffix(const string &real_install_dir,
                                           const string &jar_path,
     std::vector<string> *result) const {
   result->push_back("-jar");
-  result->push_back(blaze::ConvertPath(
-      blaze_util::JoinPath(real_install_dir, jar_path)));
+  result->push_back(
+      blaze::PathAsJvmFlag(blaze_util::JoinPath(real_install_dir, jar_path)));
 }
 
 blaze_exit_code::ExitCode StartupOptions::AddJVMArguments(