diff --git a/test/FrontendObjC/2007-10-03-MetadataPointers.mm b/test/FrontendObjC++/2007-10-03-MetadataPointers.mm
similarity index 100%
rename from test/FrontendObjC/2007-10-03-MetadataPointers.mm
rename to test/FrontendObjC++/2007-10-03-MetadataPointers.mm
diff --git a/test/FrontendObjC++/dg.exp b/test/FrontendObjC++/dg.exp
new file mode 100644
index 00000000000..15fb0bb4843
--- /dev/null
+++ b/test/FrontendObjC++/dg.exp
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if [ llvm_gcc_supports objc++ ] then {
+    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{mm}]]
+}
diff --git a/test/FrontendObjC/dg.exp b/test/FrontendObjC/dg.exp
index 90100ddd94e..18f73a79787 100644
--- a/test/FrontendObjC/dg.exp
+++ b/test/FrontendObjC/dg.exp
@@ -2,6 +2,4 @@ load_lib llvm.exp
 
 if [ llvm_gcc_supports objc ] then {
     RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]]
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{mm}]]
 }
-