diff --git a/lldb/test/API/macosx/debugserver-exit-code/Makefile b/lldb/test/API/macosx/debugserver-exit-code/Makefile
new file mode 100644
--- /dev/null
+++ b/lldb/test/API/macosx/debugserver-exit-code/Makefile
@@ -0,0 +1,3 @@
+C_SOURCES := main.c
+
+include Makefile.rules
diff --git a/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py b/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py
new file mode 100644
--- /dev/null
+++ b/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py
@@ -0,0 +1,27 @@
+"""
+Tests the exit code/description coming from the debugserver.
+"""
+
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+class TestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    @no_debug_info_test
+    @skipUnlessDarwin
+    @skipIfOutOfTreeDebugserver
+    def test_abort(self):
+        self.build()
+        target = self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
+        process = target.LaunchSimple(None, None, None)
+        # Continue until process is terminated.
+        process.Continue()
+        # Test for the abort signal code.
+        self.assertEqual(process.GetExitStatus(), 6)
+        # Test for the exit code description.
+        self.assertEqual(process.GetExitDescription(),
+                         "Terminated due to signal 6")
diff --git a/lldb/test/Shell/Process/Inputs/abort.c b/lldb/test/API/macosx/debugserver-exit-code/main.c
rename from lldb/test/Shell/Process/Inputs/abort.c
rename to lldb/test/API/macosx/debugserver-exit-code/main.c
diff --git a/lldb/test/Shell/Process/TestAbortExitCode.test b/lldb/test/Shell/Process/TestAbortExitCode.test
deleted file mode 100644
--- a/lldb/test/Shell/Process/TestAbortExitCode.test
+++ /dev/null
@@ -1,6 +0,0 @@
-UNSUPPORTED: system-windows
-
-RUN: %clang_host %p/Inputs/abort.c -o %t
-RUN: %lldb %t -o run -o continue | FileCheck %s
-
-CHECK: {{status = 6 \(0x00000006\)|status = 0 \(0x00000000\) Terminated due to signal 6}}