set any "\[^\r\n\]*"
 
     set neg_decimal "-?$decimal"
-    gdb_test "info registers" \
+
+    set expected \
        [multi_line \
             "rax            $hex +$neg_decimal" \
             "rbx            $hex +$neg_decimal" \
             "fs             $hex +$neg_decimal" \
             "gs             $hex +$neg_decimal" \
            ]
+
+    # There may be more registers.
+    append expected ".*"
+
+    gdb_test "info registers" $expected
 }
 
 proc jit_reader_test {} {
 
                # Since the JIT unwinder only provides RIP/RSP/RBP,
                # all other registers should show as "<not saved>".
-               gdb_test "info registers" \
+
+               set expected \
                    [multi_line \
                         "rax            <not saved>" \
                         "rbx            <not saved>" \
                         "gs             <not saved>" \
                        ]
 
+               # There may be more registers.
+               append expected ".*"
+
+               gdb_test "info registers" $expected
+
                # Make sure that "info frame" doesn't crash.
                gdb_test "info frame" "Stack level 1, .*in main.*"