diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 82592c42ee94e55966f3e219c260dba5e1a3de96..4a566ca2e47740c019af7dced39d8d517d12d258 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-18  Mark Kettenis  <kettenis@gnu.org>
 
+	* gdb.base/sigaltstack.exp (finish_test): KFAIL gdb/1736 on
+	*-*-openbsd*.
+	* gdb.base/sigstep.exp (advancei): KFAIL gdb/1736 on *-*-openbsd*.
+
 	* gdb.base/sigaltstack.c (main): Use stack_t instead of `struct
 	sigaltsatck'.
 
diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp
index d1e37d8aa9846ac83a25abb900e7f246cb8c155f..75af2f0ad0003c42145e152a8e1243cc42672929 100644
--- a/gdb/testsuite/gdb.base/sigaltstack.exp
+++ b/gdb/testsuite/gdb.base/sigaltstack.exp
@@ -87,6 +87,7 @@ proc finish_test { pattern msg } {
 	    # trampolines.  We can't set a breakpoint there, and we
 	    # don't gracefully fall back to single-stepping.
 	    setup_kfail "i?86-*-linux*" gdb/1736
+	    setup_kfail "*-*-openbsd*" gdb/1736
 	    fail "$msg (could not set breakpoint)"
 	}
 	-re "$pattern.*${gdb_prompt} $" {
diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp
index 81f8eed45338737cdd5f8b8eae16b9e607efe98b..6addca7ebda7281b3bc726b076a1865dca4c89e1 100644
--- a/gdb/testsuite/gdb.base/sigstep.exp
+++ b/gdb/testsuite/gdb.base/sigstep.exp
@@ -118,6 +118,7 @@ proc advancei { i } {
             # trampolines.  We can't set a breakpoint there, and we
             # don't gracefully fall back to single-stepping.
             setup_kfail "i?86-*-linux*" gdb/1736
+	    setup_kfail "*-*-openbsd*" gdb/1736
             fail "$test (could not set breakpoint)"
 	    return
         }