diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7983271bb1..6187c749dc 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-07  Pedro Alves  <palves@redhat.com>
+
+	PR gdb/17511
+	* gdb.base/sigstep.exp (in_handler_map) <si+advance>: xfail
+	i?86-*-linux*.
+
 2014-11-03  Siva Chandra Reddy  <sivachandra@google.com>
 
 	PR c++/17494
diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp
index c4580a7a67..4fea6beb9a 100644
--- a/gdb/testsuite/gdb.base/sigstep.exp
+++ b/gdb/testsuite/gdb.base/sigstep.exp
@@ -155,6 +155,7 @@ set in_handler_map {
 		# subsequent PTRACE_CONTINUEs trapping after each
 		# insn.
 		if {$enter_cmd != "continue"} {
+		    setup_xfail "i?86-*-linux*" gdb/17511
 		    setup_xfail "x86_64-*-linux*" gdb/17511
 		}
 		fail "$test (spurious SIGTRAP)"