diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 18c3988b210..855ceaaa3db 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-11-11  Simon Marchi  <simon.marchi@efficios.com>
+
+	* gdb.base/continue-after-aborted-step-over.exp: Add "breakpoint
+	always-inserted" axis.
+	(do_test): Add breakpoint_always_inserted parameter.
+
 2020-11-10  Tom Tromey  <tromey@adacore.com>
 
 	* gdb.ada/bias.exp: Update.
diff --git a/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp b/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
index 6a54ce1ff9f..558f5fb9d10 100644
--- a/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
+++ b/gdb/testsuite/gdb.base/continue-after-aborted-step-over.exp
@@ -41,13 +41,14 @@ if {[build_executable "failed to prepare" $testfile $srcfile debug]} {
 }
 
 # DISPLACED indicates whether to use displaced-stepping.
-proc do_test {displaced} {
+proc do_test {displaced breakpoint_always_inserted} {
     global gdb_prompt decimal
     global srcfile binfile
 
     clean_restart $binfile
 
     gdb_test_no_output "set displaced-stepping $displaced"
+    gdb_test_no_output "set breakpoint always-inserted $breakpoint_always_inserted"
 
     if ![runto_main] {
 	fail "run to main"
@@ -64,7 +65,11 @@ proc do_test {displaced} {
     }
 
     # Set a breakpoint that fails to insert.
-    gdb_test "b *0" "Breakpoint $decimal at 0x0"
+    if { $breakpoint_always_inserted == "on" } {
+	gdb_test "b *0" "Breakpoint $decimal at 0x0.*"
+    } else {
+	gdb_test "b *0" "Breakpoint $decimal at 0x0"
+    }
 
     gdb_test "continue" \
 	"Command aborted\\." \
@@ -83,5 +88,7 @@ proc do_test {displaced} {
 # machinery.  So make sure this runs with displaced stepping disabled,
 # and for good measure, also try with displaced stepping enabled.
 foreach_with_prefix displaced-stepping {"off" "on"} {
-    do_test ${displaced-stepping}
+    foreach_with_prefix breakpoint-always-inserted {"off" "on"} {
+	do_test ${displaced-stepping} ${breakpoint-always-inserted}
+    }
 }