Index: test/lang/objc/objc-builtin-types/Makefile
===================================================================
--- test/lang/objc/objc-builtin-types/Makefile
+++ test/lang/objc/objc-builtin-types/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../../make
 
-CXX_SOURCES := main.cpp
+OBJCXX_SOURCES := main.mm
+LD_EXTRAS = -framework Foundation
 
 include $(LEVEL)/Makefile.rules
Index: test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
===================================================================
--- test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
+++ test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
@@ -30,7 +30,7 @@
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line numbers to break inside main().
-        self.main_source = "main.cpp"
+        self.main_source = "main.mm"
         self.break_line = line_number(self.main_source, '// Set breakpoint here.')
 
     #<rdar://problem/10591460> [regression] Can't print ivar value: error: reference to 'id' is ambiguous
@@ -60,7 +60,7 @@
         frame = thread_list[0].GetFrameAtIndex(0)
         self.assertTrue (frame, "Got a valid frame 0 frame.")
 
-        self.expect("expr (foo)", patterns = ["\(ns::id\) \$.* = 0"])
+        self.expect("expr (foo)", patterns = ["\(ns::ns_id\) \$.* = nil"])
 
         self.expect("expr id my_id = 0; my_id", patterns = ["\(id\) \$.* = nil"])
 
Index: test/lang/objc/objc-builtin-types/main.cpp
===================================================================
--- test/lang/objc/objc-builtin-types/main.cpp
+++ test/lang/objc/objc-builtin-types/main.cpp
@@ -1,9 +0,0 @@
-namespace ns {
-  typedef int id;
-};
-
-int main()
-{
-  ns::id foo = 0;
-  return foo; // Set breakpoint here.
-}
Index: test/lang/objc/objc-builtin-types/main.mm
===================================================================
--- test/lang/objc/objc-builtin-types/main.mm
+++ test/lang/objc/objc-builtin-types/main.mm
@@ -1,9 +1,9 @@
 namespace ns {
-  typedef int id;
+  typedef id ns_id;
 };
 
 int main()
 {
-  ns::id foo = 0;
-  return foo; // Set breakpoint here.
+  ns::ns_id foo = 0;
+  return foo == 0 ? 0 : 1; // Set breakpoint here.
 }