diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.cc b/gdb/testsuite/gdb.cp/step-and-next-inline.cc
index 6f0a7fbda9e..26b29d01777 100644
--- a/gdb/testsuite/gdb.cp/step-and-next-inline.cc
+++ b/gdb/testsuite/gdb.cp/step-and-next-inline.cc
@@ -41,7 +41,7 @@ tree_check (tree *t, int i)
     abort();
   tree *x = t;
   return x;
-}
+} // tree-check
 
 #endif	/* USE_NEXT_INLINE_H */
 
@@ -54,7 +54,7 @@ get_alias_set (tree *t)
       && TREE_TYPE (t).z != 3)
     return 0;
   return 1;
-}
+} // get_alias_set
 
 tree xx;
 
@@ -63,4 +63,4 @@ main()
 {
   get_alias_set (&xx);
   return 0;
-}
+} // main
diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.exp b/gdb/testsuite/gdb.cp/step-and-next-inline.exp
index 85f7b8d5af1..13d801bb539 100644
--- a/gdb/testsuite/gdb.cp/step-and-next-inline.exp
+++ b/gdb/testsuite/gdb.cp/step-and-next-inline.exp
@@ -67,29 +67,100 @@ proc do_test { use_header } {
     gdb_test "step" ".*" "step into get_alias_set"
     gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 1"
+
     # It's possible that this first failure (when not using a header
     # file) is GCC's fault, though the remaining failures would best
     # be fixed by adding location views support (though it could be
     # that some easier heuristic could be figured out).  Still, it is
     # not certain that the first failure wouldn't also be fixed by
     # having location view support, so for now it is tagged as such.
-    if {[test_compiler_info gcc*] && !$use_header} {
-	setup_kfail "*-*-*" symtab/25507
+    set have_kfail [expr [test_compiler_info gcc*] && !$use_header]
+
+    set ok 1
+    gdb_test_multiple "next" "next step 1" {
+	-re -wrap "if \\(t->x != i\\)" {
+	    set ok 0
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap ".*TREE_TYPE.* != 1" {
+	    if { $ok } {
+		pass $gdb_test_name
+	    } else {
+		if { $have_kfail } {
+		    setup_kfail "*-*-*" symtab/25507
+		}
+		fail $gdb_test_name
+	    }
+	}
     }
-    gdb_test "next" ".*TREE_TYPE.*" "next step 1"
     gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 2"
-    gdb_test "next" ".*TREE_TYPE.*" "next step 2"
+
+    set ok 1
+    gdb_test_multiple "next" "next step 2" {
+	-re -wrap "return x;" {
+	    set ok 0
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap ".*TREE_TYPE.* != 2" {
+	    if { $ok } {
+		pass $gdb_test_name
+	    } else {
+		if { $have_kfail } {
+		    setup_kfail "*-*-*" symtab/25507
+		}
+		fail $gdb_test_name
+	    }
+	}
+    }
     gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 3"
-    if {[test_compiler_info gcc*] && !$use_header} {
-	setup_kfail "*-*-*" symtab/25507
+
+    set ok 1
+    gdb_test_multiple "next" "next step 3" {
+	-re -wrap "return x;" {
+	    set ok 0
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap ".*TREE_TYPE.* != 3\\)" {
+	    if { $ok } {
+		pass $gdb_test_name
+	    } else {
+		if { $have_kfail } {
+		    setup_kfail "*-*-*" symtab/25507
+		}
+		fail $gdb_test_name
+	    }
+	}
     }
-    gdb_test "next" ".*TREE_TYPE.*" "next step 3"
     gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 4"
-    if {!$use_header} { setup_kfail "*-*-*" symtab/25507 }
-    gdb_test "next" "return 0.*" "next step 4"
+
+    set ok 1
+    gdb_test_multiple "next" "next step 4" {
+	-re -wrap "(if \\(t != NULL|\} // get_alias_set)" {
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap "return x;" {
+	    set ok 0
+	    send_gdb "next\n"
+	    exp_continue
+	}
+	-re -wrap "return 0.*" {
+	    if { $ok } {
+		pass $gdb_test_name
+	    } else {
+		if { $have_kfail } {
+		    setup_kfail "*-*-*" symtab/25507
+		}
+		fail $gdb_test_name
+	    }
+	}
+    }
     gdb_test "bt" \
 	"\\s*\\#0\\s+(main|get_alias_set)\[^\r\]*${srcfile}:.*" \
 	"not in inline 5"
diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.h b/gdb/testsuite/gdb.cp/step-and-next-inline.h
index 8eb4b71d3cc..bf45d8a388c 100644
--- a/gdb/testsuite/gdb.cp/step-and-next-inline.h
+++ b/gdb/testsuite/gdb.cp/step-and-next-inline.h
@@ -35,4 +35,4 @@ tree_check (tree *t, int i)
     abort();
   tree *x = t;
   return x;
-}
+} // tree_check