diff --git a/lldb/test/array_types/Makefile b/lldb/test/lang/c/array_types/Makefile
similarity index 71%
rename from lldb/test/array_types/Makefile
rename to lldb/test/lang/c/array_types/Makefile
index d6cd0db0506f..b09a579159d4 100644
--- a/lldb/test/array_types/Makefile
+++ b/lldb/test/lang/c/array_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/array_types/TestArrayTypes.py b/lldb/test/lang/c/array_types/TestArrayTypes.py
similarity index 99%
rename from lldb/test/array_types/TestArrayTypes.py
rename to lldb/test/lang/c/array_types/TestArrayTypes.py
index 7d5eea1d3cec..81cb65fd0d8f 100644
--- a/lldb/test/array_types/TestArrayTypes.py
+++ b/lldb/test/lang/c/array_types/TestArrayTypes.py
@@ -7,7 +7,7 @@ from lldbtest import *
 
 class ArrayTypesTestCase(TestBase):
 
-    mydir = "array_types"
+    mydir = os.path.join("lang", "c", "array_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/array_types/cmds.txt b/lldb/test/lang/c/array_types/cmds.txt
similarity index 100%
rename from lldb/test/array_types/cmds.txt
rename to lldb/test/lang/c/array_types/cmds.txt
diff --git a/lldb/test/array_types/main.c b/lldb/test/lang/c/array_types/main.c
similarity index 100%
rename from lldb/test/array_types/main.c
rename to lldb/test/lang/c/array_types/main.c
diff --git a/lldb/test/bitfields/Makefile b/lldb/test/lang/c/bitfields/Makefile
similarity index 71%
rename from lldb/test/bitfields/Makefile
rename to lldb/test/lang/c/bitfields/Makefile
index d6cd0db0506f..b09a579159d4 100644
--- a/lldb/test/bitfields/Makefile
+++ b/lldb/test/lang/c/bitfields/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/bitfields/TestBitfields.py b/lldb/test/lang/c/bitfields/TestBitfields.py
similarity index 99%
rename from lldb/test/bitfields/TestBitfields.py
rename to lldb/test/lang/c/bitfields/TestBitfields.py
index bf8f541bc25b..be091cb57cd8 100644
--- a/lldb/test/bitfields/TestBitfields.py
+++ b/lldb/test/lang/c/bitfields/TestBitfields.py
@@ -7,7 +7,7 @@ from lldbtest import *
 
 class BitfieldsTestCase(TestBase):
 
-    mydir = "bitfields"
+    mydir = os.path.join("lang", "c", "bitfields")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/bitfields/main.c b/lldb/test/lang/c/bitfields/main.c
similarity index 100%
rename from lldb/test/bitfields/main.c
rename to lldb/test/lang/c/bitfields/main.c
diff --git a/lldb/test/signed_types/Makefile b/lldb/test/lang/cpp/class_static/Makefile
similarity index 72%
rename from lldb/test/signed_types/Makefile
rename to lldb/test/lang/cpp/class_static/Makefile
index d4bc9c689043..314f1cb2f077 100644
--- a/lldb/test/signed_types/Makefile
+++ b/lldb/test/lang/cpp/class_static/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/class_static/TestStaticVariables.py b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
similarity index 99%
rename from lldb/test/class_static/TestStaticVariables.py
rename to lldb/test/lang/cpp/class_static/TestStaticVariables.py
index b23eb675aad8..18415b16595d 100644
--- a/lldb/test/class_static/TestStaticVariables.py
+++ b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class StaticVariableTestCase(TestBase):
 
-    mydir = "class_static"
+    mydir = os.path.join("lang", "cpp", "class_static")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/class_static/main.cpp b/lldb/test/lang/cpp/class_static/main.cpp
similarity index 100%
rename from lldb/test/class_static/main.cpp
rename to lldb/test/lang/cpp/class_static/main.cpp
diff --git a/lldb/test/unique-types/Makefile b/lldb/test/lang/cpp/class_types/Makefile
similarity index 72%
rename from lldb/test/unique-types/Makefile
rename to lldb/test/lang/cpp/class_types/Makefile
index d4bc9c689043..314f1cb2f077 100644
--- a/lldb/test/unique-types/Makefile
+++ b/lldb/test/lang/cpp/class_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/class_types/TestClassTypes.py b/lldb/test/lang/cpp/class_types/TestClassTypes.py
similarity index 99%
rename from lldb/test/class_types/TestClassTypes.py
rename to lldb/test/lang/cpp/class_types/TestClassTypes.py
index 358c32d62936..657f90d23958 100644
--- a/lldb/test/class_types/TestClassTypes.py
+++ b/lldb/test/lang/cpp/class_types/TestClassTypes.py
@@ -8,7 +8,7 @@ from lldbtest import *
 
 class ClassTypesTestCase(TestBase):
 
-    mydir = "class_types"
+    mydir = os.path.join("lang", "cpp", "class_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/class_types/TestClassTypesDisassembly.py b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
similarity index 98%
rename from lldb/test/class_types/TestClassTypesDisassembly.py
rename to lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
index 3cb10dadf8a0..9d88fb29f8b4 100644
--- a/lldb/test/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class IterateFrameAndDisassembleTestCase(TestBase):
 
-    mydir = "class_types"
+    mydir = os.path.join("lang", "cpp", "class_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/class_types/cmds.txt b/lldb/test/lang/cpp/class_types/cmds.txt
similarity index 100%
rename from lldb/test/class_types/cmds.txt
rename to lldb/test/lang/cpp/class_types/cmds.txt
diff --git a/lldb/test/class_types/main.cpp b/lldb/test/lang/cpp/class_types/main.cpp
similarity index 100%
rename from lldb/test/class_types/main.cpp
rename to lldb/test/lang/cpp/class_types/main.cpp
diff --git a/lldb/test/class_static/Makefile b/lldb/test/lang/cpp/signed_types/Makefile
similarity index 72%
rename from lldb/test/class_static/Makefile
rename to lldb/test/lang/cpp/signed_types/Makefile
index d4bc9c689043..314f1cb2f077 100644
--- a/lldb/test/class_static/Makefile
+++ b/lldb/test/lang/cpp/signed_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/signed_types/TestSignedTypes.py b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
similarity index 97%
rename from lldb/test/signed_types/TestSignedTypes.py
rename to lldb/test/lang/cpp/signed_types/TestSignedTypes.py
index 2f7933fa31c2..7a3e86659828 100644
--- a/lldb/test/signed_types/TestSignedTypes.py
+++ b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class UnsignedTypesTestCase(TestBase):
 
-    mydir = "signed_types"
+    mydir = os.path.join("lang", "cpp", "signed_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/signed_types/main.cpp b/lldb/test/lang/cpp/signed_types/main.cpp
similarity index 100%
rename from lldb/test/signed_types/main.cpp
rename to lldb/test/lang/cpp/signed_types/main.cpp
diff --git a/lldb/test/class_types/Makefile b/lldb/test/lang/cpp/unique-types/Makefile
similarity index 72%
rename from lldb/test/class_types/Makefile
rename to lldb/test/lang/cpp/unique-types/Makefile
index d4bc9c689043..314f1cb2f077 100644
--- a/lldb/test/class_types/Makefile
+++ b/lldb/test/lang/cpp/unique-types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/unique-types/TestUniqueTypes.py b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
similarity index 98%
rename from lldb/test/unique-types/TestUniqueTypes.py
rename to lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
index 4d7083884efb..a5a265d571ed 100644
--- a/lldb/test/unique-types/TestUniqueTypes.py
+++ b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class UniqueTypesTestCase(TestBase):
 
-    mydir = "unique-types"
+    mydir = os.path.join("lang", "cpp", "unique-types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/unique-types/main.cpp b/lldb/test/lang/cpp/unique-types/main.cpp
similarity index 100%
rename from lldb/test/unique-types/main.cpp
rename to lldb/test/lang/cpp/unique-types/main.cpp
diff --git a/lldb/test/lang/cpp/unsigned_types/Makefile b/lldb/test/lang/cpp/unsigned_types/Makefile
new file mode 100644
index 000000000000..314f1cb2f077
--- /dev/null
+++ b/lldb/test/lang/cpp/unsigned_types/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/unsigned_types/TestUnsignedTypes.py b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
similarity index 97%
rename from lldb/test/unsigned_types/TestUnsignedTypes.py
rename to lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
index e8156b5b922c..b616f4682eda 100644
--- a/lldb/test/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class UnsignedTypesTestCase(TestBase):
 
-    mydir = "unsigned_types"
+    mydir = os.path.join("lang", "cpp", "unsigned_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/unsigned_types/main.cpp b/lldb/test/lang/cpp/unsigned_types/main.cpp
similarity index 100%
rename from lldb/test/unsigned_types/main.cpp
rename to lldb/test/lang/cpp/unsigned_types/main.cpp
diff --git a/lldb/test/unsigned_types/Makefile b/lldb/test/unsigned_types/Makefile
deleted file mode 100644
index d4bc9c689043..000000000000
--- a/lldb/test/unsigned_types/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules