diff --git a/lldb/test/forward/Makefile b/lldb/test/lang/c/forward/Makefile
similarity index 73%
rename from lldb/test/forward/Makefile
rename to lldb/test/lang/c/forward/Makefile
index b7a7b56fa80d..1db43ab479b2 100644
--- a/lldb/test/forward/Makefile
+++ b/lldb/test/lang/c/forward/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c foo.c
 
diff --git a/lldb/test/forward/README.txt b/lldb/test/lang/c/forward/README.txt
similarity index 100%
rename from lldb/test/forward/README.txt
rename to lldb/test/lang/c/forward/README.txt
diff --git a/lldb/test/forward/TestForwardDeclaration.py b/lldb/test/lang/c/forward/TestForwardDeclaration.py
similarity index 98%
rename from lldb/test/forward/TestForwardDeclaration.py
rename to lldb/test/lang/c/forward/TestForwardDeclaration.py
index cf8d7ceef83b..d336e5a5614d 100644
--- a/lldb/test/forward/TestForwardDeclaration.py
+++ b/lldb/test/lang/c/forward/TestForwardDeclaration.py
@@ -7,7 +7,7 @@ from lldbtest import *
 
 class ForwardDeclarationTestCase(TestBase):
 
-    mydir = "forward"
+    mydir = os.path.join("lang", "c", "forward")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/forward/foo.c b/lldb/test/lang/c/forward/foo.c
similarity index 100%
rename from lldb/test/forward/foo.c
rename to lldb/test/lang/c/forward/foo.c
diff --git a/lldb/test/forward/foo.h b/lldb/test/lang/c/forward/foo.h
similarity index 100%
rename from lldb/test/forward/foo.h
rename to lldb/test/lang/c/forward/foo.h
diff --git a/lldb/test/forward/main.c b/lldb/test/lang/c/forward/main.c
similarity index 100%
rename from lldb/test/forward/main.c
rename to lldb/test/lang/c/forward/main.c
diff --git a/lldb/test/function_types/Makefile b/lldb/test/lang/c/function_types/Makefile
similarity index 71%
rename from lldb/test/function_types/Makefile
rename to lldb/test/lang/c/function_types/Makefile
index d6cd0db0506f..b09a579159d4 100644
--- a/lldb/test/function_types/Makefile
+++ b/lldb/test/lang/c/function_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/function_types/TestFunctionTypes.py b/lldb/test/lang/c/function_types/TestFunctionTypes.py
similarity index 97%
rename from lldb/test/function_types/TestFunctionTypes.py
rename to lldb/test/lang/c/function_types/TestFunctionTypes.py
index 4a05f18ab272..d050af0ceea7 100644
--- a/lldb/test/function_types/TestFunctionTypes.py
+++ b/lldb/test/lang/c/function_types/TestFunctionTypes.py
@@ -7,7 +7,7 @@ from lldbtest import *
 
 class FunctionTypesTestCase(TestBase):
 
-    mydir = "function_types"
+    mydir = os.path.join("lang", "c", "function_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/function_types/main.c b/lldb/test/lang/c/function_types/main.c
similarity index 100%
rename from lldb/test/function_types/main.c
rename to lldb/test/lang/c/function_types/main.c