Index: lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteDiskFileCompletion.py
===================================================================
--- lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteDiskFileCompletion.py
+++ lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteDiskFileCompletion.py
@@ -1,6 +1,6 @@
 from gdbclientutils import *
 
-class TestGDBRemoteDiskFileCompletion(GDBRemoteTestBase):
+class TestGDBRemoteDiskFileCompletion(GDBPlatformClientTestBase):
 
     def test_autocomplete_request(self):
         """Test remote disk completion on remote-gdb-server plugin"""
@@ -15,11 +15,6 @@
         self.server.responder = Responder()
 
         try:
-            self.runCmd("platform select remote-gdb-server")
-            self.runCmd("platform connect connect://" +
-                        self.server.get_connect_address())
-            self.assertTrue(self.dbg.GetSelectedPlatform().IsConnected())
-
             self.complete_from_to('platform get-size ', ['test', '123'])
             self.complete_from_to('platform get-file ', ['test', '123'])
             self.complete_from_to('platform put-file foo ', ['test', '123'])
Index: lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py
===================================================================
--- lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py
+++ lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py
@@ -1,6 +1,6 @@
 from gdbclientutils import *
 
-class TestGDBRemotePlatformFile(GDBRemoteTestBase):
+class TestGDBRemotePlatformFile(GDBPlatformClientTestBase):
 
     def test_file(self):
         """Test mock operations on a remote file"""
@@ -20,11 +20,6 @@
         self.server.responder = Responder()
 
         try:
-            self.runCmd("platform select remote-gdb-server")
-            self.runCmd("platform connect connect://" +
-                        self.server.get_connect_address())
-            self.assertTrue(self.dbg.GetSelectedPlatform().IsConnected())
-
             self.match("platform file open /some/file.txt -v 0755",
                        [r"File Descriptor = 16"])
             self.match("platform file read 16 -o 11 -c 13",
@@ -52,11 +47,6 @@
         self.server.responder = Responder()
 
         try:
-            self.runCmd("platform select remote-gdb-server")
-            self.runCmd("platform connect connect://" +
-                        self.server.get_connect_address())
-            self.assertTrue(self.dbg.GetSelectedPlatform().IsConnected())
-
             self.match("platform file open /some/file.txt -v 0755",
                        [r"error: Invalid argument"],
                        error=True)
@@ -88,11 +78,6 @@
         self.server.responder = Responder()
 
         try:
-            self.runCmd("platform select remote-gdb-server")
-            self.runCmd("platform connect connect://" +
-                        self.server.get_connect_address())
-            self.assertTrue(self.dbg.GetSelectedPlatform().IsConnected())
-
             self.match("platform get-size /some/file.txt",
                        [r"File size of /some/file\.txt \(remote\): 4096"])
             self.assertPacketLogContains([
@@ -117,11 +102,6 @@
         self.server.responder = Responder()
 
         try:
-            self.runCmd("platform select remote-gdb-server")
-            self.runCmd("platform connect connect://" +
-                        self.server.get_connect_address())
-            self.assertTrue(self.dbg.GetSelectedPlatform().IsConnected())
-
             self.match("platform get-size /some/file.txt",
                        [r"File size of /some/file\.txt \(remote\): 66051"])
             self.assertPacketLogContains([
Index: lldb/test/API/functionalities/gdb_remote_client/gdbclientutils.py
===================================================================
--- lldb/test/API/functionalities/gdb_remote_client/gdbclientutils.py
+++ lldb/test/API/functionalities/gdb_remote_client/gdbclientutils.py
@@ -566,3 +566,19 @@
         if i < len(packets):
             self.fail(u"Did not receive: %s\nLast 10 packets:\n\t%s" %
                     (packets[i], u'\n\t'.join(log)))
+
+
+class GDBPlatformClientTestBase(GDBRemoteTestBase):
+    """
+    Base class for platform server clients.
+
+    This class extends GDBRemoteTestBase by automatically connecting
+    via "platform connect" in the setUp() method.
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.runCmd("platform select remote-gdb-server")
+        self.runCmd("platform connect connect://" +
+                    self.server.get_connect_address())
+        self.assertTrue(self.dbg.GetSelectedPlatform().IsConnected())