diff --git a/lldb/test/inferior-crashing/Makefile b/lldb/test/functionalities/inferior-crashing/Makefile
similarity index 73%
rename from lldb/test/inferior-crashing/Makefile
rename to lldb/test/functionalities/inferior-crashing/Makefile
index d6cd0db0506f..0d70f2595019 100644
--- a/lldb/test/inferior-crashing/Makefile
+++ b/lldb/test/functionalities/inferior-crashing/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/inferior-crashing/TestInferiorCrashing.py b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py
similarity index 97%
rename from lldb/test/inferior-crashing/TestInferiorCrashing.py
rename to lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py
index d4c46cae8d07..6bee74adec59 100644
--- a/lldb/test/inferior-crashing/TestInferiorCrashing.py
+++ b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py
@@ -7,7 +7,7 @@ from lldbtest import *
 
 class CrashingInferiorTestCase(TestBase):
 
-    mydir = "inferior-crashing"
+    mydir = os.path.join("functionalities", "inferior-crashing")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_inferior_crashing_dsym(self):
diff --git a/lldb/test/inferior-crashing/main.c b/lldb/test/functionalities/inferior-crashing/main.c
similarity index 100%
rename from lldb/test/inferior-crashing/main.c
rename to lldb/test/functionalities/inferior-crashing/main.c
diff --git a/lldb/test/platform/TestPlatformCommand.py b/lldb/test/functionalities/platform/TestPlatformCommand.py
similarity index 94%
rename from lldb/test/platform/TestPlatformCommand.py
rename to lldb/test/functionalities/platform/TestPlatformCommand.py
index 41be7b8bce2a..dbdebea5c87f 100644
--- a/lldb/test/platform/TestPlatformCommand.py
+++ b/lldb/test/functionalities/platform/TestPlatformCommand.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class PlatformCommandTestCase(TestBase):
 
-    mydir = "platform"
+    mydir = os.path.join("functionalities", "platform")
 
     def test_help_platform(self):
         self.runCmd("help platform")
diff --git a/lldb/test/order/Makefile b/lldb/test/macosx/order/Makefile
similarity index 86%
rename from lldb/test/order/Makefile
rename to lldb/test/macosx/order/Makefile
index 78c176404665..30d3a51d0ec4 100644
--- a/lldb/test/order/Makefile
+++ b/lldb/test/macosx/order/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 C_SOURCES := main.c
 LDFLAGS = $(CFLAGS) -Xlinker -order_file ./order-file
diff --git a/lldb/test/order/TestOrderFile.py b/lldb/test/macosx/order/TestOrderFile.py
similarity index 97%
rename from lldb/test/order/TestOrderFile.py
rename to lldb/test/macosx/order/TestOrderFile.py
index efd0c9f227c9..d7651cb46fdc 100644
--- a/lldb/test/order/TestOrderFile.py
+++ b/lldb/test/macosx/order/TestOrderFile.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class OrderFileTestCase(TestBase):
 
-    mydir = "order"
+    mydir = os.path.join("macosx", "order")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/order/cmds.txt b/lldb/test/macosx/order/cmds.txt
similarity index 100%
rename from lldb/test/order/cmds.txt
rename to lldb/test/macosx/order/cmds.txt
diff --git a/lldb/test/order/main.c b/lldb/test/macosx/order/main.c
similarity index 100%
rename from lldb/test/order/main.c
rename to lldb/test/macosx/order/main.c
diff --git a/lldb/test/order/order-file b/lldb/test/macosx/order/order-file
similarity index 100%
rename from lldb/test/order/order-file
rename to lldb/test/macosx/order/order-file