diff --git a/test/support/console_test_case.rb b/test/support/console_test_case.rb
index 3a09bd161..1f42fa438 100644
--- a/test/support/console_test_case.rb
+++ b/test/support/console_test_case.rb
@@ -105,6 +105,8 @@ def debug_code(program, remote: true, &test_steps)
             rescue Exception => e
               th.each(&:kill)
               flunk "#{e.class.name}: #{e.message}"
+            ensure
+              th.each {|t| t.join}
             end
           elsif remote && !NO_REMOTE
             debug_code_on_local