diff --git a/test/DebugInfo/2006-11-06-StackTrace.cpp b/test/C++Frontend/2006-11-06-StackTrace.cpp
similarity index 100%
rename from test/DebugInfo/2006-11-06-StackTrace.cpp
rename to test/C++Frontend/2006-11-06-StackTrace.cpp
diff --git a/test/DebugInfo/2006-11-20-GlobalSymbols.cpp b/test/C++Frontend/2006-11-20-GlobalSymbols.cpp
similarity index 100%
rename from test/DebugInfo/2006-11-20-GlobalSymbols.cpp
rename to test/C++Frontend/2006-11-20-GlobalSymbols.cpp
diff --git a/test/DebugInfo/2006-11-30-NoCompileUnit.cpp b/test/C++Frontend/2006-11-30-NoCompileUnit.cpp
similarity index 100%
rename from test/DebugInfo/2006-11-30-NoCompileUnit.cpp
rename to test/C++Frontend/2006-11-30-NoCompileUnit.cpp
diff --git a/test/DebugInfo/2006-11-30-Pubnames.cpp b/test/C++Frontend/2006-11-30-Pubnames.cpp
similarity index 100%
rename from test/DebugInfo/2006-11-30-Pubnames.cpp
rename to test/C++Frontend/2006-11-30-Pubnames.cpp
diff --git a/test/DebugInfo/2007-01-02-UnboundedArray.cpp b/test/C++Frontend/2007-01-02-UnboundedArray.cpp
similarity index 100%
rename from test/DebugInfo/2007-01-02-UnboundedArray.cpp
rename to test/C++Frontend/2007-01-02-UnboundedArray.cpp
diff --git a/test/CodeGen/Generic/BasicInstrs.c b/test/CFrontend/BasicInstrs.c
similarity index 100%
rename from test/CodeGen/Generic/BasicInstrs.c
rename to test/CFrontend/BasicInstrs.c
diff --git a/test/DebugInfo/funccall.c b/test/CFrontend/funccall.c
similarity index 100%
rename from test/DebugInfo/funccall.c
rename to test/CFrontend/funccall.c