diff --git a/llvm/test/FrontendC++/2006-11-06-StackTrace.cpp b/llvm/test/FrontendC++/2006-11-06-StackTrace.cpp
index 9d2fda3..26f4788 100644
--- a/llvm/test/FrontendC++/2006-11-06-StackTrace.cpp
+++ b/llvm/test/FrontendC++/2006-11-06-StackTrace.cpp
@@ -10,7 +10,10 @@
 // RUN:   grep {#7  0x.* in main.*(argc=\[12\],.*argv=.*)}
 
 // Only works on ppc, x86 and x86_64.  Should generalize?
-// XFAIL: alpha|ia64|arm|linux
+// XFAIL: alpha|ia64|arm
+
+// FIXME: Un-XFAIL this test when debug stuff is working again.
+// XFAIL: *
 
 #include <stdlib.h>