Index: packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
===================================================================
--- packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
+++ packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
@@ -239,15 +239,14 @@
 
         self.runCmd("run", RUN_SUCCEEDED)
 
+        ctx = self.platformContext
+        dylibName = ctx.shlib_prefix + 'loadunload_a.' + ctx.shlib_extension
+        localDylibPath = self.getBuildArtifact(dylibName)
         if lldb.remote_platform:
-            shlib_dir = lldb.remote_platform.GetWorkingDirectory()
-        else:
-            shlib_dir = self.mydir
-
-        if self.platformIsDarwin():
-            dylibName = self.getBuildArtifact('libloadunload_a.dylib')
+            wd = lldb.remote_platform.GetWorkingDirectory()
+            remoteDylibPath = lldbutil.join_remote_paths(wd, dylibName)
         else:
-            dylibName = self.getBuildArtifact('libloadunload_a.so')
+            remoteDylibPath = localDylibPath
 
         # Make sure that a_function does not exist at this point.
         self.expect(
@@ -259,13 +258,10 @@
 
         # Use lldb 'process load' to load the dylib.
         self.expect(
-            "process load %s --install=%s" %
-            (dylibName, dylibName),
-            "%s loaded correctly" %
-            dylibName,
+            "process load %s --install=%s" % (localDylibPath, remoteDylibPath),
+            "%s loaded correctly" % dylibName,
             patterns=[
-                'Loading "%s".*ok' %
-                dylibName,
+                'Loading "%s".*ok' % localDylibPath,
                 'Image [0-9]+ loaded'])
 
         # Search for and match the "Image ([0-9]+) loaded" pattern.
Index: packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
===================================================================
--- packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
+++ packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
@@ -82,17 +82,22 @@
         exe = self.getBuildArtifact("a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
-        outfile = self.getBuildArtifact("output.txt")
-        self.runCmd("process launch -- %s %s" %(outfile, args_in))
+        local_outfile = self.getBuildArtifact("output.txt")
+        if lldb.remote_platform:
+            remote_outfile = "output.txt" # Relative to platform's PWD
+        else:
+            remote_outfile = local_outfile
+
+        self.runCmd("process launch -- %s %s" %(remote_outfile, args_in))
 
         if lldb.remote_platform:
-            src_file_spec = lldb.SBFileSpec(outfile, False)
-            dst_file_spec = lldb.SBFileSpec(outfile, True)
+            src_file_spec = lldb.SBFileSpec(remote_outfile, False)
+            dst_file_spec = lldb.SBFileSpec(local_outfile, True)
             lldb.remote_platform.Get(src_file_spec, dst_file_spec)
 
-        with open(outfile, 'r') as f:
+        with open(local_outfile, 'r') as f:
             output = f.read()
 
-        self.RemoveTempFile(outfile)
+        self.RemoveTempFile(local_outfile)
 
         self.assertEqual(output, args_out)