diff --git a/lldb/test/cpp/dynamic-value/Makefile b/lldb/test/lang/cpp/dynamic-value/Makefile
similarity index 75%
rename from lldb/test/cpp/dynamic-value/Makefile
rename to lldb/test/lang/cpp/dynamic-value/Makefile
index ceb406ee2eab..8770b2343ef0 100644
--- a/lldb/test/cpp/dynamic-value/Makefile
+++ b/lldb/test/lang/cpp/dynamic-value/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
 
 CXX_SOURCES := pass-to-base.cpp
 
diff --git a/lldb/test/cpp/dynamic-value/TestDynamicValue.py b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
similarity index 99%
rename from lldb/test/cpp/dynamic-value/TestDynamicValue.py
rename to lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
index 9cf9e0cd37db..d44f52dd8b08 100644
--- a/lldb/test/cpp/dynamic-value/TestDynamicValue.py
+++ b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class DynamicValueTestCase(TestBase):
 
-    mydir = os.path.join("cpp", "dynamic-value")
+    mydir = os.path.join("lang", "cpp", "dynamic-value")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @python_api_test
diff --git a/lldb/test/cpp/dynamic-value/pass-to-base.cpp b/lldb/test/lang/cpp/dynamic-value/pass-to-base.cpp
similarity index 100%
rename from lldb/test/cpp/dynamic-value/pass-to-base.cpp
rename to lldb/test/lang/cpp/dynamic-value/pass-to-base.cpp
diff --git a/lldb/test/cpp/virtual/Makefile b/lldb/test/lang/cpp/virtual/Makefile
similarity index 72%
rename from lldb/test/cpp/virtual/Makefile
rename to lldb/test/lang/cpp/virtual/Makefile
index 8a7102e347af..314f1cb2f077 100644
--- a/lldb/test/cpp/virtual/Makefile
+++ b/lldb/test/lang/cpp/virtual/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/cpp/virtual/TestVirtual.py b/lldb/test/lang/cpp/virtual/TestVirtual.py
similarity index 98%
rename from lldb/test/cpp/virtual/TestVirtual.py
rename to lldb/test/lang/cpp/virtual/TestVirtual.py
index 0bf7792a35bb..9ba7fd642c14 100644
--- a/lldb/test/cpp/virtual/TestVirtual.py
+++ b/lldb/test/lang/cpp/virtual/TestVirtual.py
@@ -12,7 +12,7 @@ def Msg(expr, val):
 
 class CppVirtualMadness(TestBase):
 
-    mydir = os.path.join("cpp", "virtual")
+    mydir = os.path.join("lang", "cpp", "virtual")
 
     # This is the pattern by design to match the "my_expr = 'value'" output from
     # printf() stmts (see main.cpp).
diff --git a/lldb/test/cpp/virtual/main.cpp b/lldb/test/lang/cpp/virtual/main.cpp
similarity index 100%
rename from lldb/test/cpp/virtual/main.cpp
rename to lldb/test/lang/cpp/virtual/main.cpp