diff --git a/test/console/frame_block_identifier_test.rb b/test/console/frame_block_identifier_test.rb
index a4349da19..dd483a583 100644
--- a/test/console/frame_block_identifier_test.rb
+++ b/test/console/frame_block_identifier_test.rb
@@ -46,8 +46,8 @@ def test_frame_block_identifier
           /    15\|   end/,
           /    16\| end/,
           /=>\#0\tWhatever\#some_method at .*/,
-          /  \#1\tblock in Kernel\#loop at <internal:kernel>:168/,
-          /  \# and 2 frames \(use `bt' command for all frames\)/,
+          /  \#1\t.*/,
+          /  \# and (?:2|3) frames \(use `bt' command for all frames\)/,
           //,
           /Stop by \#0  BP \- Line  .*/
         ])
diff --git a/test/console/nested_break_test.rb b/test/console/nested_break_test.rb
index d7e2437e5..c152b3f01 100644
--- a/test/console/nested_break_test.rb
+++ b/test/console/nested_break_test.rb
@@ -83,7 +83,7 @@ def test_multiple_nested_break
           assert_line_num 2
           type 'p foo(142)'
           type 'bt'
-          assert_line_text(/\#7\s+<main>/) # TODO: can be changed
+          assert_line_text(/\#\d+\s+<main>/)
 
           type 'c'
           assert_line_text(/143/)
diff --git a/test/console/rescue_test.rb b/test/console/rescue_test.rb
new file mode 100644
index 000000000..f0225147b
--- /dev/null
+++ b/test/console/rescue_test.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative '../support/console_test_case'
+
+module DEBUGGER__
+  class RescueTest < ConsoleTestCase
+    def program
+      <<~RUBY
+     1| 1.times do
+     2|   begin
+     3|     raise
+     4|   rescue
+     5|     p :ok
+     6|   end
+     7| end
+      RUBY
+    end
+
+    def test_rescue
+      debug_code program, remote: false do
+        type 's'
+        type 's'
+        type 'c'
+      end
+    end
+  end if RUBY_VERSION.to_f >= 3.5
+end
+
diff --git a/test/console/trap_test.rb b/test/console/trap_test.rb
index 17c4ccfa7..0f18e14ac 100644
--- a/test/console/trap_test.rb
+++ b/test/console/trap_test.rb
@@ -16,7 +16,6 @@ def test_sigint
       debug_code program, remote: false do
         type 'b 3'
         type 'c'
-        assert_line_num 2
         assert_line_text(/is registered as SIGINT handler/)
         type 'sigint'
         assert_line_num 3