diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4eb5d8b16c..1f0fdd35fb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-17  Maciej W. Rozycki  <macro@mips.com>
+
+	* gdb.base/sigbpt.exp: Preset segv_addr.
+
 2007-05-16  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* lib/gdb.exp (gdb_compile): Add support for Windows DLLs.
diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp
index 313818ae3c..a7f54ad2f9 100644
--- a/gdb/testsuite/gdb.base/sigbpt.exp
+++ b/gdb/testsuite/gdb.base/sigbpt.exp
@@ -86,6 +86,7 @@ gdb_test "break keeper"
 # of the actual SIGSEGV in segv_addr.
 
 set bowler_addrs bowler
+set segv_addr none
 gdb_test {display/i $pc}
 gdb_test "advance *bowler" "bowler.*" "advance to the bowler"
 set test "stepping to SIGSEGV"