diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4301b03286..ca49a28784 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix XFAIL compatibility with old i386 systems.
+	* gdb.base/stale-infcall.exp (test system longjmp tracking support):
+	Check also 'Cannot insert breakpoint 0'.
+
 2012-07-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	PR 14321
diff --git a/gdb/testsuite/gdb.base/stale-infcall.exp b/gdb/testsuite/gdb.base/stale-infcall.exp
index 9d73ebdbd1..0aa8c2ae10 100644
--- a/gdb/testsuite/gdb.base/stale-infcall.exp
+++ b/gdb/testsuite/gdb.base/stale-infcall.exp
@@ -33,7 +33,7 @@ gdb_test_multiple "next" $test {
     -re " test-pass .*\r\n$gdb_prompt $" {
 	pass $test
     }
-    -re " test-fail .*\r\n$gdb_prompt $" {
+    -re "( test-fail .*|\r\nCannot insert breakpoint 0\\.\r\n.*)\r\n$gdb_prompt $" {
 	xfail $test
 	untested "System lacks support for tracking longjmps"
 	return -1