Index: gcc/testsuite/g++.dg/other/darwin-cfstring1.C
===================================================================
--- gcc/testsuite/g++.dg/other/darwin-cfstring1.C	(revision 192531)
+++ gcc/testsuite/g++.dg/other/darwin-cfstring1.C	(working copy)
@@ -4,7 +4,7 @@
 /* Developed by Ziemowit Laski <zlaski@apple.com>.  */
 
 /* { dg-do compile { target *-*-darwin* } } */
-/* { dg-options "-mconstant-cfstrings" } */
+/* { dg-options "-ftrack-macro-expansion=0 -mconstant-cfstrings" } */
 
 #include <CoreFoundation/CFString.h>
 
Index: gcc/testsuite/obj-c++.dg/strings/const-cfstring-2.mm
===================================================================
--- gcc/testsuite/obj-c++.dg/strings/const-cfstring-2.mm	(revision 192531)
+++ gcc/testsuite/obj-c++.dg/strings/const-cfstring-2.mm	(working copy)
@@ -6,7 +6,7 @@
 /* So far, CFString is darwin-only.  */
 /* { dg-do compile { target *-*-darwin* } } */
 /* { dg-skip-if "NeXT only" { *-*-* } { "-fgnu-runtime" } { "" } } */
-/* { dg-options "-mconstant-cfstrings -Wnonportable-cfstrings" } */
+/* { dg-options "-ftrack-macro-expansion=0 -mconstant-cfstrings -Wnonportable-cfstrings" } */
 
 #import <Foundation/NSString.h>
 #import <CoreFoundation/CFString.h>