diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b697d6c039..23ba804c54 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+Thu Nov  2 09:50:05 1995  Fred Fish  <fnf@cygnus.com>
+
+	* gdb.base/a1-selftest.exp: Remove i*86-*-sysv4* and
+	i*86-*-linux* xfails for "backtrace through signal handler".
+	* gdb.base/corefile.exp: Add i*86-*-sysv4* xfail for
+	"print func2::coremaker_local".
+	* gdb.base/break.exp: Add i*86-*-sysv4*, sparc-sun-sunos4,
+ 	xfail for
+	"delete all breakpoints when none".
+	
+
 Wed Nov  1 15:57:16 1995  Fred Fish  <fnf@cygnus.com>
 
 	* gdb.base/break.exp: Change test that deletes all breakpoints
diff --git a/gdb/testsuite/gdb.base/a1-selftest.exp b/gdb/testsuite/gdb.base/a1-selftest.exp
index 4d07e7de4b..6243573258 100644
--- a/gdb/testsuite/gdb.base/a1-selftest.exp
+++ b/gdb/testsuite/gdb.base/a1-selftest.exp
@@ -446,7 +446,6 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$prompt $"\
     }
     
     # get a stack trace
-    setup_xfail "i*86-*-linux*" "i*86-*-sysv4*"
     set description "backtrace through signal handler"
     send "backtrace\n"
     expect {
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index 2496e15c61..0104a357e3 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -67,10 +67,12 @@ expect {
     -re "Delete all breakpoints.*y or n. $"\
 	{ send "y\n"
 	    expect {
-		-re ".*$prompt $" {}
+		-re ".*$prompt $" {
+		    setup_xfail "i*86-*-sysv4*" "sparc-sun-sunos4*"
+		    fail "Delete all breakpoints when none"
+		}
 		timeout	{ fail "Delete all breakpoints when none (timeout)" }
 	    }
-	    fail "Delete all breakpoints when none (known pre 4.16 bug)"
 	}
     -re ".*$prompt $"       { pass "Delete all breakpoints when none" }
     timeout	            { fail "Delete all breakpoints when none" }