diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a044d5a44f3..e00afa7de5a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-07  Yao Qi  <yao.qi@linaro.org>
+
+	* gdb.reverse/finish-reverse-bkpt.exp: Use temporary breakpoint.
+	Execute "si" command.
+
 2016-04-07  Yao Qi  <yao.qi@linaro.org>
 
 	* gdb.reverse/next-reverse-bkpt-over-sr.exp: Match the breakpoint
diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
index ccc332d7e2c..1dff8e10002 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp
@@ -40,11 +40,16 @@ if [supports_process_record] {
 }
 
 set breakloc [gdb_get_line_number "VOID FUNC" "$srcfile"]
-gdb_test "break void_func" \
-    "Breakpoint $decimal at .*$srcfile, line $breakloc\." \
+gdb_test "tbreak void_func" \
+    "Temporary breakpoint $decimal at .*$srcfile, line $breakloc\." \
     "set breakpoint on void_func"
 gdb_continue_to_breakpoint "void_func" ".*$srcfile:$breakloc.*"
 
+# We stop at the brekapoint on void_func, but breakpoint on
+# *void_func will be set at the same place if function void_func doesn't
+# have prologue.  One step forward to avoid this.
+gdb_test "si"
+
 gdb_test "break \*void_func" \
     "Breakpoint $decimal at .*" \
     "set breakpoint at void_func's entry"