Index: lldb/trunk/test/tools/lldb-server/TestGdbRemoteAttach.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemoteAttach.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemoteAttach.py
@@ -6,6 +6,8 @@
 
 class TestGdbRemoteAttach(gdbremote_testcase.GdbRemoteTestCaseBase):
 
+    mydir = TestBase.compute_mydir(__file__)
+
     def attach_with_vAttach(self):
         # Start the inferior, start the debug monitor, nothing is attached yet.
         procs = self.prep_debug_monitor_and_inferior(inferior_args=["sleep:60"])
Index: lldb/trunk/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
@@ -5,6 +5,8 @@
 
 class TestGdbRemoteAuxvSupport(gdbremote_testcase.GdbRemoteTestCaseBase):
 
+    mydir = TestBase.compute_mydir(__file__)
+
     AUXV_SUPPORT_FEATURE_NAME = "qXfer:auxv:read"
 
     def has_auxv_support(self):
Index: lldb/trunk/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
@@ -5,6 +5,8 @@
 
 class TestGdbRemoteExpeditedRegisters(gdbremote_testcase.GdbRemoteTestCaseBase):
 
+    mydir = TestBase.compute_mydir(__file__)
+
     def gather_expedited_registers(self):
         # Setup the stub and set the gdb remote command stream.
         procs = self.prep_debug_monitor_and_inferior(inferior_args=["sleep:2"])
Index: lldb/trunk/test/tools/lldb-server/TestGdbRemoteKill.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemoteKill.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemoteKill.py
@@ -6,6 +6,9 @@
 from lldbtest import *
 
 class TestGdbRemoteKill(gdbremote_testcase.GdbRemoteTestCaseBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
     def attach_commandline_kill_after_initial_stop(self):
         procs = self.prep_debug_monitor_and_inferior()
         self.test_sequence.add_log_lines([
Index: lldb/trunk/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
@@ -7,6 +7,8 @@
 
 class TestGdbRemoteProcessInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
 
+    mydir = TestBase.compute_mydir(__file__)
+
     def qProcessInfo_returns_running_process(self):
         procs = self.prep_debug_monitor_and_inferior()
         self.add_process_info_collection_packets()
Index: lldb/trunk/test/tools/lldb-server/TestGdbRemoteRegisterState.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemoteRegisterState.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemoteRegisterState.py
@@ -6,6 +6,8 @@
 class TestGdbRemoteRegisterState(gdbremote_testcase.GdbRemoteTestCaseBase):
     """Test QSaveRegisterState/QRestoreRegisterState support."""
 
+    mydir = TestBase.compute_mydir(__file__)
+
     def grp_register_save_restore_works(self, with_suffix):
         # Start up the process, use thread suffix, grab main thread id.
         inferior_args = ["message:main entered", "sleep:5"]
Index: lldb/trunk/test/tools/lldb-server/TestGdbRemoteSingleStep.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemoteSingleStep.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemoteSingleStep.py
@@ -5,6 +5,8 @@
 
 class TestGdbRemoteSingleStep(gdbremote_testcase.GdbRemoteTestCaseBase):
 
+    mydir = TestBase.compute_mydir(__file__)
+
     @debugserver_test
     @dsym_test
     def test_single_step_only_steps_one_instruction_with_s_debugserver_dsym(self):
Index: lldb/trunk/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
@@ -5,6 +5,8 @@
 
 class TestGdbRemoteThreadsInStopReply(gdbremote_testcase.GdbRemoteTestCaseBase):
 
+    mydir = TestBase.compute_mydir(__file__)
+
     ENABLE_THREADS_IN_STOP_REPLY_ENTRIES = [
         "read packet: $QListThreadsInStopReply#21",
         "send packet: $OK#00",
Index: lldb/trunk/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
@@ -6,6 +6,7 @@
 
 class TestGdbRemote_qThreadStopInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
 
+    mydir = TestBase.compute_mydir(__file__)
     THREAD_COUNT = 5
 
     def gather_stop_replies_via_qThreadStopInfo(self, thread_count):
Index: lldb/trunk/test/tools/lldb-server/TestGdbRemote_vCont.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemote_vCont.py
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemote_vCont.py
@@ -5,6 +5,8 @@
 
 class TestGdbRemote_vCont(gdbremote_testcase.GdbRemoteTestCaseBase):
 
+    mydir = TestBase.compute_mydir(__file__)
+
     def vCont_supports_mode(self, mode, inferior_args=None):
         # Setup the stub and set the gdb remote command stream.
         procs = self.prep_debug_monitor_and_inferior(inferior_args=inferior_args)
Index: lldb/trunk/test/tools/lldb-server/TestLldbGdbServer.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/TestLldbGdbServer.py
+++ lldb/trunk/test/tools/lldb-server/TestLldbGdbServer.py
@@ -19,6 +19,8 @@
 
 class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
 
+    mydir = TestBase.compute_mydir(__file__)
+
     @debugserver_test
     def test_exe_starts_debugserver(self):
         self.init_debugserver_test()
Index: lldb/trunk/test/tools/lldb-server/commandline/TestStubReverseConnect.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/commandline/TestStubReverseConnect.py
+++ lldb/trunk/test/tools/lldb-server/commandline/TestStubReverseConnect.py
@@ -7,6 +7,9 @@
 from lldbtest import *
 
 class TestStubReverseConnect(gdbremote_testcase.GdbRemoteTestCaseBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
     _DEFAULT_TIMEOUT = 20
 
     def setUp(self):
Index: lldb/trunk/test/tools/lldb-server/commandline/TestStubSetSID.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/commandline/TestStubSetSID.py
+++ lldb/trunk/test/tools/lldb-server/commandline/TestStubSetSID.py
@@ -9,6 +9,9 @@
 from lldbtest import *
 
 class TestStubSetSIDTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
     def get_stub_sid(self, extra_stub_args=None):
         # Launch debugserver
         if extra_stub_args:
Index: lldb/trunk/test/tools/lldb-server/gdbremote_testcase.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/gdbremote_testcase.py
+++ lldb/trunk/test/tools/lldb-server/gdbremote_testcase.py
@@ -23,8 +23,6 @@
 
 class GdbRemoteTestCaseBase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     _TIMEOUT_SECONDS = 5
 
     _GDBREMOTE_KILL_PACKET = "$k#6b"