diff --git a/lldb/test/process_launch/Makefile b/lldb/test/functionalities/process_launch/Makefile
similarity index 82%
rename from lldb/test/process_launch/Makefile
rename to lldb/test/functionalities/process_launch/Makefile
index 95bf9faedbc6..313da706b4a2 100644
--- a/lldb/test/process_launch/Makefile
+++ b/lldb/test/functionalities/process_launch/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 CXX_SOURCES := main.cpp
 #CXX_SOURCES := print-cwd.cpp
diff --git a/lldb/test/process_launch/TestProcessLaunch.py b/lldb/test/functionalities/process_launch/TestProcessLaunch.py
similarity index 98%
rename from lldb/test/process_launch/TestProcessLaunch.py
rename to lldb/test/functionalities/process_launch/TestProcessLaunch.py
index e548bdc46c98..8135c11698de 100644
--- a/lldb/test/process_launch/TestProcessLaunch.py
+++ b/lldb/test/functionalities/process_launch/TestProcessLaunch.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class ProcessLaunchTestCase(TestBase):
 
-    mydir = "process_launch"
+    mydir = os.path.join("functionalities", "process_launch")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_io_with_dsym (self):
diff --git a/lldb/test/process_launch/input-file.txt b/lldb/test/functionalities/process_launch/input-file.txt
similarity index 100%
rename from lldb/test/process_launch/input-file.txt
rename to lldb/test/functionalities/process_launch/input-file.txt
diff --git a/lldb/test/process_launch/main.cpp b/lldb/test/functionalities/process_launch/main.cpp
similarity index 100%
rename from lldb/test/process_launch/main.cpp
rename to lldb/test/functionalities/process_launch/main.cpp
diff --git a/lldb/test/process_launch/print_cwd.cpp b/lldb/test/functionalities/process_launch/print_cwd.cpp
similarity index 100%
rename from lldb/test/process_launch/print_cwd.cpp
rename to lldb/test/functionalities/process_launch/print_cwd.cpp
diff --git a/lldb/test/signal/Makefile b/lldb/test/functionalities/signal/Makefile
similarity index 73%
rename from lldb/test/signal/Makefile
rename to lldb/test/functionalities/signal/Makefile
index d6cd0db0506f..0d70f2595019 100644
--- a/lldb/test/signal/Makefile
+++ b/lldb/test/functionalities/signal/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/signal/TestSendSignal.py b/lldb/test/functionalities/signal/TestSendSignal.py
similarity index 98%
rename from lldb/test/signal/TestSendSignal.py
rename to lldb/test/functionalities/signal/TestSendSignal.py
index afd0247ec007..d470dff5f5c1 100644
--- a/lldb/test/signal/TestSendSignal.py
+++ b/lldb/test/functionalities/signal/TestSendSignal.py
@@ -7,7 +7,7 @@ from lldbtest import *
 
 class SendSignalTestCase(TestBase):
 
-    mydir = "signal"
+    mydir = os.path.join("functionalities", "signal")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/signal/main.c b/lldb/test/functionalities/signal/main.c
similarity index 100%
rename from lldb/test/signal/main.c
rename to lldb/test/functionalities/signal/main.c
diff --git a/lldb/test/stop-hook/Makefile b/lldb/test/functionalities/stop-hook/Makefile
similarity index 75%
rename from lldb/test/stop-hook/Makefile
rename to lldb/test/functionalities/stop-hook/Makefile
index d4bc9c689043..8a7102e347af 100644
--- a/lldb/test/stop-hook/Makefile
+++ b/lldb/test/functionalities/stop-hook/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/stop-hook/TestStopHookCmd.py b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
similarity index 97%
rename from lldb/test/stop-hook/TestStopHookCmd.py
rename to lldb/test/functionalities/stop-hook/TestStopHookCmd.py
index 78ad38e84594..1e5d48ed4e17 100644
--- a/lldb/test/stop-hook/TestStopHookCmd.py
+++ b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class StopHookCmdTestCase(TestBase):
 
-    mydir = "stop-hook"
+    mydir = os.path.join("functionalities", "stop-hook")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/stop-hook/TestStopHookMechanism.py b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
similarity index 98%
rename from lldb/test/stop-hook/TestStopHookMechanism.py
rename to lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
index fbff37f193b1..c9639ea0fc8c 100644
--- a/lldb/test/stop-hook/TestStopHookMechanism.py
+++ b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class StopHookMechanismTestCase(TestBase):
 
-    mydir = "stop-hook"
+    mydir = os.path.join("functionalities", "stop-hook")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/stop-hook/main.cpp b/lldb/test/functionalities/stop-hook/main.cpp
similarity index 100%
rename from lldb/test/stop-hook/main.cpp
rename to lldb/test/functionalities/stop-hook/main.cpp
diff --git a/lldb/test/target/Makefile b/lldb/test/functionalities/target_command/Makefile
similarity index 81%
rename from lldb/test/target/Makefile
rename to lldb/test/functionalities/target_command/Makefile
index e4b33e52e32d..9117ab9388b7 100644
--- a/lldb/test/target/Makefile
+++ b/lldb/test/functionalities/target_command/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 # Example:
 #
diff --git a/lldb/test/target/TestTargetCommand.py b/lldb/test/functionalities/target_command/TestTargetCommand.py
similarity index 98%
rename from lldb/test/target/TestTargetCommand.py
rename to lldb/test/functionalities/target_command/TestTargetCommand.py
index 59afb12aa3c0..eeb11f136b46 100644
--- a/lldb/test/target/TestTargetCommand.py
+++ b/lldb/test/functionalities/target_command/TestTargetCommand.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class targetCommandTestCase(TestBase):
 
-    mydir = "target"
+    mydir = os.path.join("functionalities", "target_command")
 
     def setUp(self):
         # Call super's setUp().
diff --git a/lldb/test/target/a.c b/lldb/test/functionalities/target_command/a.c
similarity index 100%
rename from lldb/test/target/a.c
rename to lldb/test/functionalities/target_command/a.c
diff --git a/lldb/test/target/b.c b/lldb/test/functionalities/target_command/b.c
similarity index 100%
rename from lldb/test/target/b.c
rename to lldb/test/functionalities/target_command/b.c
diff --git a/lldb/test/target/c.c b/lldb/test/functionalities/target_command/c.c
similarity index 100%
rename from lldb/test/target/c.c
rename to lldb/test/functionalities/target_command/c.c