diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bdb.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bdb.txt
index 5beb3016d7..9d6fbeff3a 100644
--- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bdb.txt
+++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bdb.txt
@@ -10,9 +10,7 @@ test.test_bdb.BreakpointTestCase.test_ignore_count_on_disabled_bp @ darwin-arm64
 test.test_bdb.BreakpointTestCase.test_load_bps_from_previous_Bdb_instance @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_bdb.BreakpointTestCase.test_temporary_bp @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_bdb.IssuesTestCase.test_next_to_botframe @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_bdb.IssuesTestCase.test_next_until_return_in_generator @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-# TODO: GR-71863
-!test.test_bdb.IssuesTestCase.test_next_until_return_in_generator @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_bdb.IssuesTestCase.test_next_until_return_in_generator @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_bdb.IssuesTestCase.test_step_at_return_with_no_trace_in_caller @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_bdb.RunTestCase.test_run_step @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_bdb.RunTestCase.test_runeval_step @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_setprofile.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_setprofile.txt
index e82f0150ff..d50101280f 100644
--- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_setprofile.txt
+++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_setprofile.txt
@@ -4,17 +4,13 @@ test.test_sys_setprofile.ProfileHookTestCase.test_distant_exception @ darwin-arm
 test.test_sys_setprofile.ProfileHookTestCase.test_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileHookTestCase.test_exception_in_except_clause @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileHookTestCase.test_exception_propagation @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_setprofile.ProfileHookTestCase.test_generator @ linux-aarch64,linux-aarch64-github,linux-x86_64-github
-# GR-71865
-!test.test_sys_setprofile.ProfileHookTestCase.test_generator @ darwin-arm64,linux-x86_64,win32-AMD64
+test.test_sys_setprofile.ProfileHookTestCase.test_generator @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileHookTestCase.test_nested_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileHookTestCase.test_raise @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileHookTestCase.test_raise_reraise @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileHookTestCase.test_raise_twice @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileHookTestCase.test_simple @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_setprofile.ProfileHookTestCase.test_stop_iteration @ linux-aarch64,linux-aarch64-github,linux-x86_64-github
-# GR-71865
-!test.test_sys_setprofile.ProfileHookTestCase.test_stop_iteration @ darwin-arm64,linux-x86_64,win32-AMD64
+test.test_sys_setprofile.ProfileHookTestCase.test_stop_iteration @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileSimulatorTestCase.test_basic_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileSimulatorTestCase.test_caught_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_setprofile.ProfileSimulatorTestCase.test_distant_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_settrace.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_settrace.txt
index 304b693f88..9edeb6250f 100644
--- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_settrace.txt
+++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_settrace.txt
@@ -19,9 +19,7 @@ test.test_sys_settrace.SkipLineEventsTraceTestCase.test_10_ireturn @ darwin-arm6
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_11_tightloop @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_12_tighterloop @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_14_onliner_if @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.SkipLineEventsTraceTestCase.test_15_loops @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-# GR-71864
-!test.test_sys_settrace.SkipLineEventsTraceTestCase.test_15_loops @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.SkipLineEventsTraceTestCase.test_15_loops @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_16_blank_lines @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_17_none_f_trace @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_18_except_with_name @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -34,10 +32,9 @@ test.test_sys_settrace.SkipLineEventsTraceTestCase.test_break_to_continue2 @ dar
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_class_creation_with_decorator @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_class_creation_with_docstrings @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_continue_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-!test.test_sys_settrace.SkipLineEventsTraceTestCase.test_early_exit_with @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.SkipLineEventsTraceTestCase.test_early_exit_with @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_finally_with_conditional @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.SkipLineEventsTraceTestCase.test_flow_converges_on_same_line @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.SkipLineEventsTraceTestCase.test_flow_converges_on_same_line @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.SkipLineEventsTraceTestCase.test_flow_converges_on_same_line @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_if_break @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_if_false_in_try_except @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_if_false_in_with @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -50,7 +47,7 @@ test.test_sys_settrace.SkipLineEventsTraceTestCase.test_nested_loops @ darwin-ar
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_nested_try_if @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_no_tracing_of_named_except_cleanup @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_notrace_lambda @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-!test.test_sys_settrace.SkipLineEventsTraceTestCase.test_return_through_finally @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.SkipLineEventsTraceTestCase.test_return_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_set_and_retrieve_func @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_set_and_retrieve_none @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_settrace_error @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -63,8 +60,7 @@ test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_except_star_named_ex
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_except_star_named_no_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_except_star_nested @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_except_star_no_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_except_with_wrong_type @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_except_with_wrong_type @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_except_with_wrong_type @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_exception_in_else @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_in_try @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.SkipLineEventsTraceTestCase.test_try_in_try_with_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -77,8 +73,7 @@ test.test_sys_settrace.TestLinesAfterTraceStarted.test_02_arigo1 @ darwin-arm64,
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_02_arigo2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_03_one_instr @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_04_no_pop_blocks @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestLinesAfterTraceStarted.test_05_no_pop_tops @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestLinesAfterTraceStarted.test_05_no_pop_tops @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestLinesAfterTraceStarted.test_05_no_pop_tops @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_06_call @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_07_raise @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_08_settrace_and_return @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -87,8 +82,7 @@ test.test_sys_settrace.TestLinesAfterTraceStarted.test_10_ireturn @ darwin-arm64
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_11_tightloop @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_12_tighterloop @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_14_onliner_if @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestLinesAfterTraceStarted.test_15_loops @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestLinesAfterTraceStarted.test_15_loops @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestLinesAfterTraceStarted.test_15_loops @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_16_blank_lines @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_17_none_f_trace @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_18_except_with_name @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -96,16 +90,14 @@ test.test_sys_settrace.TestLinesAfterTraceStarted.test_19_except_with_finally @
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_21_repeated_pass @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_break_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_break_to_break @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestLinesAfterTraceStarted.test_break_to_continue1 @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestLinesAfterTraceStarted.test_break_to_continue1 @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_sys_settrace.TestLinesAfterTraceStarted.test_break_to_continue2 @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestLinesAfterTraceStarted.test_break_to_continue2 @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestLinesAfterTraceStarted.test_break_to_continue1 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
+test.test_sys_settrace.TestLinesAfterTraceStarted.test_break_to_continue2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_class_creation_with_decorator @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_continue_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
+test.test_sys_settrace.TestLinesAfterTraceStarted.test_early_exit_with @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_events @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_finally_with_conditional @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestLinesAfterTraceStarted.test_flow_converges_on_same_line @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestLinesAfterTraceStarted.test_flow_converges_on_same_line @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestLinesAfterTraceStarted.test_flow_converges_on_same_line @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_if_break @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_if_false_in_try_except @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_if_false_in_with @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -118,7 +110,7 @@ test.test_sys_settrace.TestLinesAfterTraceStarted.test_nested_loops @ darwin-arm
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_nested_try_if @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_no_tracing_of_named_except_cleanup @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_notrace_lambda @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-!test.test_sys_settrace.TestLinesAfterTraceStarted.test_return_through_finally @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestLinesAfterTraceStarted.test_return_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_set_and_retrieve_func @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_set_and_retrieve_none @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_settrace_error @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -131,8 +123,7 @@ test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_except_star_named_exc
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_except_star_named_no_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_except_star_nested @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_except_star_no_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_except_with_wrong_type @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_except_with_wrong_type @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_except_with_wrong_type @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_exception_in_else @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_in_try @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestLinesAfterTraceStarted.test_try_in_try_with_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -143,8 +134,7 @@ test.test_sys_settrace.TestSetLocalTrace.test_02_arigo1 @ darwin-arm64,linux-aar
 test.test_sys_settrace.TestSetLocalTrace.test_02_arigo2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_03_one_instr @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_04_no_pop_blocks @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestSetLocalTrace.test_05_no_pop_tops @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestSetLocalTrace.test_05_no_pop_tops @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestSetLocalTrace.test_05_no_pop_tops @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_06_call @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_07_raise @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_08_settrace_and_return @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -153,8 +143,7 @@ test.test_sys_settrace.TestSetLocalTrace.test_10_ireturn @ darwin-arm64,linux-aa
 test.test_sys_settrace.TestSetLocalTrace.test_11_tightloop @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_12_tighterloop @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_14_onliner_if @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestSetLocalTrace.test_15_loops @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestSetLocalTrace.test_15_loops @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestSetLocalTrace.test_15_loops @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_16_blank_lines @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_17_none_f_trace @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_18_except_with_name @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -162,15 +151,13 @@ test.test_sys_settrace.TestSetLocalTrace.test_19_except_with_finally @ darwin-ar
 test.test_sys_settrace.TestSetLocalTrace.test_21_repeated_pass @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_break_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_break_to_break @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestSetLocalTrace.test_break_to_continue1 @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestSetLocalTrace.test_break_to_continue1 @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_sys_settrace.TestSetLocalTrace.test_break_to_continue2 @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestSetLocalTrace.test_break_to_continue2 @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestSetLocalTrace.test_break_to_continue1 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
+test.test_sys_settrace.TestSetLocalTrace.test_break_to_continue2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_class_creation_with_decorator @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_continue_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
+test.test_sys_settrace.TestSetLocalTrace.test_early_exit_with @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_finally_with_conditional @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestSetLocalTrace.test_flow_converges_on_same_line @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestSetLocalTrace.test_flow_converges_on_same_line @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestSetLocalTrace.test_flow_converges_on_same_line @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_if_break @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_if_false_in_try_except @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_if_false_in_with @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -183,7 +170,7 @@ test.test_sys_settrace.TestSetLocalTrace.test_nested_loops @ darwin-arm64,linux-
 test.test_sys_settrace.TestSetLocalTrace.test_nested_try_if @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_no_tracing_of_named_except_cleanup @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_notrace_lambda @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-!test.test_sys_settrace.TestSetLocalTrace.test_return_through_finally @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestSetLocalTrace.test_return_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_set_and_retrieve_func @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_set_and_retrieve_none @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_settrace_error @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -196,8 +183,7 @@ test.test_sys_settrace.TestSetLocalTrace.test_try_except_star_named_exception_no
 test.test_sys_settrace.TestSetLocalTrace.test_try_except_star_named_no_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_try_except_star_nested @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_try_except_star_no_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TestSetLocalTrace.test_try_except_with_wrong_type @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TestSetLocalTrace.test_try_except_with_wrong_type @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TestSetLocalTrace.test_try_except_with_wrong_type @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_try_exception_in_else @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_try_in_try @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TestSetLocalTrace.test_try_in_try_with_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -209,8 +195,7 @@ test.test_sys_settrace.TraceTestCase.test_02_arigo1 @ darwin-arm64,linux-aarch64
 test.test_sys_settrace.TraceTestCase.test_02_arigo2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_03_one_instr @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_04_no_pop_blocks @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TraceTestCase.test_05_no_pop_tops @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TraceTestCase.test_05_no_pop_tops @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TraceTestCase.test_05_no_pop_tops @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_06_call @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_07_raise @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_08_settrace_and_return @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -219,8 +204,7 @@ test.test_sys_settrace.TraceTestCase.test_10_ireturn @ darwin-arm64,linux-aarch6
 test.test_sys_settrace.TraceTestCase.test_11_tightloop @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_12_tighterloop @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_14_onliner_if @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TraceTestCase.test_15_loops @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TraceTestCase.test_15_loops @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TraceTestCase.test_15_loops @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_16_blank_lines @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_17_none_f_trace @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_18_except_with_name @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -228,15 +212,13 @@ test.test_sys_settrace.TraceTestCase.test_19_except_with_finally @ darwin-arm64,
 test.test_sys_settrace.TraceTestCase.test_21_repeated_pass @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_break_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_break_to_break @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TraceTestCase.test_break_to_continue1 @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TraceTestCase.test_break_to_continue1 @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_sys_settrace.TraceTestCase.test_break_to_continue2 @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TraceTestCase.test_break_to_continue2 @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TraceTestCase.test_break_to_continue1 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
+test.test_sys_settrace.TraceTestCase.test_break_to_continue2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_class_creation_with_decorator @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_continue_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
+test.test_sys_settrace.TraceTestCase.test_early_exit_with @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_finally_with_conditional @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TraceTestCase.test_flow_converges_on_same_line @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TraceTestCase.test_flow_converges_on_same_line @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TraceTestCase.test_flow_converges_on_same_line @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_if_break @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_if_false_in_try_except @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_if_false_in_with @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -249,7 +231,7 @@ test.test_sys_settrace.TraceTestCase.test_nested_loops @ darwin-arm64,linux-aarc
 test.test_sys_settrace.TraceTestCase.test_nested_try_if @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_no_tracing_of_named_except_cleanup @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_notrace_lambda @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-!test.test_sys_settrace.TraceTestCase.test_return_through_finally @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TraceTestCase.test_return_through_finally @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_set_and_retrieve_func @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_set_and_retrieve_none @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_settrace_error @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -262,8 +244,7 @@ test.test_sys_settrace.TraceTestCase.test_try_except_star_named_exception_not_ca
 test.test_sys_settrace.TraceTestCase.test_try_except_star_named_no_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_try_except_star_nested @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_try_except_star_no_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_sys_settrace.TraceTestCase.test_try_except_with_wrong_type @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
-!test.test_sys_settrace.TraceTestCase.test_try_except_with_wrong_type @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys_settrace.TraceTestCase.test_try_except_with_wrong_type @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_try_exception_in_else @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_try_in_try @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_sys_settrace.TraceTestCase.test_try_in_try_with_exception @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java
index 9fedc0c19e..d937928c9b 100644
--- a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java
+++ b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java
@@ -864,11 +864,9 @@ void endRootSourceSection(Builder b) {
 
     void beginReturn(Builder b) {
         b.beginReturn();
-        b.beginTraceOrProfileReturn();
     }
 
     void endReturn(Builder b) {
-        b.endTraceOrProfileReturn();
         b.endReturn();
     }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java
index cbd9b104a8..ff82783437 100644
--- a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java
+++ b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java
@@ -537,6 +537,9 @@ public static final class EpilogForReturn {
         public static Object doExit(VirtualFrame frame, Object returnValue,
                         @Bind PBytecodeDSLRootNode root,
                         @Bind BytecodeNode location) {
+            if (root.needsTraceAndProfileInstrumentation()) {
+                root.traceOrProfileReturn(frame, location, returnValue);
+            }
             root.calleeContext.exit(frame, root, location);
             return returnValue;
         }