diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/Makefile b/lldb/test/API/commands/gui/basicdebug/Makefile
similarity index 100%
rename from lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/Makefile
rename to lldb/test/API/commands/gui/basicdebug/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/TestGuiBasicDebug.py b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
similarity index 83%
rename from lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/TestGuiBasicDebug.py
rename to lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
index 54c763fd2afc..76d9d3bdc463 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/TestGuiBasicDebug.py
+++ b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
@@ -11,7 +11,11 @@ class TestGuiBasicDebugCommandTest(PExpectTest):
 
     mydir = TestBase.compute_mydir(__file__)
 
+    # PExpect uses many timeouts internally and doesn't play well
+    # under ASAN on a loaded machine..
+    @skipIfAsan
     @skipIfCursesSupportMissing
+    @skipIfRemote # "run" command will not work correctly for remote debug
     def test_gui(self):
         self.build()
 
@@ -39,4 +43,8 @@ class TestGuiBasicDebugCommandTest(PExpectTest):
         self.child.send("n") # step over
         self.child.expect("return 0;[^\r\n]+<<< Thread 1: step over")
 
+        # Press escape to quit the gui
+        self.child.send(escape_key)
+
+        self.expect_prompt()
         self.quit()
diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/func.c b/lldb/test/API/commands/gui/basicdebug/func.c
similarity index 100%
rename from lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/func.c
rename to lldb/test/API/commands/gui/basicdebug/func.c
diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/main.c b/lldb/test/API/commands/gui/basicdebug/main.c
similarity index 100%
rename from lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/main.c
rename to lldb/test/API/commands/gui/basicdebug/main.c