diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6cb817a2..50d16928 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,6 @@ jobs:
           - "6.1"
           - "7.0"
           - "main"
-        continue-on-error: [ false ]
 
         # Disabled until minitest relaxes its upper bound: https://github.com/seattlerb/minitest/pull/862
         # > minitest-5.14.2 requires ruby version < 3.1, >= 2.2, which is incompatible with the current version, ruby 3.1.0p-1
@@ -25,7 +24,7 @@ jobs:
 
     name: ${{ format('Tests (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.continue-on-error }}
+    continue-on-error: true
 
     steps:
       - uses: actions/checkout@v1
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 53b69b5e..22e2353e 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -1,4 +1,4 @@
-require "turbo_test"
+require "test_helper"
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400]
diff --git a/test/drive/drive_helper_test.rb b/test/drive/drive_helper_test.rb
index d3cbf0d9..d22cc52d 100644
--- a/test/drive/drive_helper_test.rb
+++ b/test/drive/drive_helper_test.rb
@@ -1,4 +1,4 @@
-require "turbo_test"
+require "test_helper"
 
 class Turbo::DriveHelperTest < ActionDispatch::IntegrationTest
   test "opting out of the default cache" do
diff --git a/test/dummy/app/views/application/_template_button.html.erb b/test/dummy/app/views/application/_template_button.html.erb
new file mode 100644
index 00000000..acd6d8d3
--- /dev/null
+++ b/test/dummy/app/views/application/_template_button.html.erb
@@ -0,0 +1,14 @@
+<button type="button">
+  <%= content %>
+
+  <script>
+    document.currentScript.parentElement.addEventListener("click", ({ currentTarget }) => {
+      for (const template of currentTarget.querySelectorAll("template")) {
+        currentTarget.parentElement.insertBefore(template.content, currentTarget)
+      }
+      currentTarget.remove()
+    })
+  </script>
+
+  <template><%= yield %></template>
+</button>
diff --git a/test/dummy/app/views/messages/echo.html.erb b/test/dummy/app/views/messages/echo.html.erb
index ceace5e9..b73139a3 100644
--- a/test/dummy/app/views/messages/echo.html.erb
+++ b/test/dummy/app/views/messages/echo.html.erb
@@ -1,5 +1,8 @@
 <h1>Echo Messages</h1>
 
-<%= turbo_stream_from "messages", channel: EchoChannel, data: {message: "Hello, world!"} %>
+<%= render "template_button", content: "Start listening for broadcasts" do %>
+  <%= turbo_stream_from "messages", channel: EchoChannel, data: {message: "Hello, world!"} %>
+<% end %>
+
 <div id="messages">
 </div>
diff --git a/test/dummy/app/views/messages/index.html.erb b/test/dummy/app/views/messages/index.html.erb
index 10ee7e96..4eb53daf 100644
--- a/test/dummy/app/views/messages/index.html.erb
+++ b/test/dummy/app/views/messages/index.html.erb
@@ -1,9 +1,8 @@
 <h1>Messages</h1>
 
-<span id="message-count">
-  <%= @messages.count %> messages sent
-</span>
+<%= render "template_button", content: "Start listening for broadcasts" do %>
+  <%= turbo_stream_from "messages" %>
+<% end %>
 
-<%= turbo_stream_from "messages" %>
 <div id="messages">
 </div>
diff --git a/test/dummy/app/views/users/profiles/index.html.erb b/test/dummy/app/views/users/profiles/index.html.erb
index a3c19a5b..e5fa3551 100644
--- a/test/dummy/app/views/users/profiles/index.html.erb
+++ b/test/dummy/app/views/users/profiles/index.html.erb
@@ -1,4 +1,8 @@
 <h1>Users::Profiles</h1>
 
-<%= turbo_stream_from "users_profiles" %>
-<div id="users_profiles"></div>
+<%= render "template_button", content: "Start listening for broadcasts" do %>
+  <%= turbo_stream_from "users_profiles" %>
+<% end %>
+
+<div id="users_profiles">
+</div>
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
index fefb2358..9d1ed2f3 100644
--- a/test/dummy/config/application.rb
+++ b/test/dummy/config/application.rb
@@ -12,7 +12,7 @@
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 6.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
diff --git a/test/dummy/config/cable.yml b/test/dummy/config/cable.yml
index 1cd0f836..663e871e 100644
--- a/test/dummy/config/cable.yml
+++ b/test/dummy/config/cable.yml
@@ -2,7 +2,7 @@ development:
   adapter: async
 
 test:
-  adapter: async
+  adapter: inline
 
 production:
   adapter: redis
diff --git a/test/frames/frame_request_controller_test.rb b/test/frames/frame_request_controller_test.rb
index e43cd60f..3ba6fa83 100644
--- a/test/frames/frame_request_controller_test.rb
+++ b/test/frames/frame_request_controller_test.rb
@@ -1,4 +1,4 @@
-require "turbo_test"
+require "test_helper"
 
 class Turbo::FrameRequestControllerTest < ActionDispatch::IntegrationTest
   test "frame requests are rendered without a layout" do
diff --git a/test/frames/frames_helper_test.rb b/test/frames/frames_helper_test.rb
index 473b42be..678b5409 100644
--- a/test/frames/frames_helper_test.rb
+++ b/test/frames/frames_helper_test.rb
@@ -1,8 +1,6 @@
-require "turbo_test"
+require "test_helper"
 
 class Turbo::FramesHelperTest < ActionView::TestCase
-  setup { Message.delete_all }
-
   test "frame with src" do
     assert_dom_equal %(<turbo-frame src="/trays/1" id="tray"></turbo-frame>), turbo_frame_tag("tray", src: "/trays/1")
   end
diff --git a/test/initializers/helpers_test.rb b/test/initializers/helpers_test.rb
index 4f3c56a2..ce5ac036 100644
--- a/test/initializers/helpers_test.rb
+++ b/test/initializers/helpers_test.rb
@@ -1,4 +1,4 @@
-require "turbo_test"
+require "test_helper"
 
 class Turbo::HelpersInInitializersTest < ActionDispatch::IntegrationTest
   test "AC::Base has the helpers in place when initializers run" do
diff --git a/test/native/navigation_controller_test.rb b/test/native/navigation_controller_test.rb
index da7a2f4b..92e1b012 100644
--- a/test/native/navigation_controller_test.rb
+++ b/test/native/navigation_controller_test.rb
@@ -1,4 +1,4 @@
-require "turbo_test"
+require "test_helper"
 
 class Turbo::Native::NavigationControllerTest < ActionDispatch::IntegrationTest
   test "recede, resume, or refresh when native or redirect when not" do
diff --git a/test/streams/broadcastable_test.rb b/test/streams/broadcastable_test.rb
index daf1e29f..7dd757c2 100644
--- a/test/streams/broadcastable_test.rb
+++ b/test/streams/broadcastable_test.rb
@@ -1,4 +1,4 @@
-require "turbo_test"
+require "test_helper"
 require "action_cable"
 
 class Turbo::BroadcastableTest < ActionCable::Channel::TestCase
diff --git a/test/streams/streams_channel_test.rb b/test/streams/streams_channel_test.rb
index 35c990c8..dea35c6f 100644
--- a/test/streams/streams_channel_test.rb
+++ b/test/streams/streams_channel_test.rb
@@ -1,4 +1,4 @@
-require "turbo_test"
+require "test_helper"
 require "action_cable"
 
 class Turbo::StreamsChannelTest < ActionCable::Channel::TestCase
diff --git a/test/streams/streams_controller_test.rb b/test/streams/streams_controller_test.rb
index 733042b6..b1f1d3ba 100644
--- a/test/streams/streams_controller_test.rb
+++ b/test/streams/streams_controller_test.rb
@@ -1,4 +1,4 @@
-require "turbo_test"
+require "test_helper"
 
 class Turbo::StreamsControllerTest < ActionDispatch::IntegrationTest
   test "create with respond to" do
diff --git a/test/streams/streams_helper_test.rb b/test/streams/streams_helper_test.rb
index 8efb7648..6ce36438 100644
--- a/test/streams/streams_helper_test.rb
+++ b/test/streams/streams_helper_test.rb
@@ -1,4 +1,4 @@
-require "turbo_test"
+require "test_helper"
 
 class TestChannel < ApplicationCable::Channel; end
 
diff --git a/test/system/broadcasts_test.rb b/test/system/broadcasts_test.rb
index fab062bb..6a2ca3e2 100644
--- a/test/system/broadcasts_test.rb
+++ b/test/system/broadcasts_test.rb
@@ -1,61 +1,62 @@
 require "application_system_test_case"
 
 class BroadcastsTest < ApplicationSystemTestCase
-  setup { Message.delete_all }
-
-  include ActionCable::TestHelper
-
   test "Message broadcasts Turbo Streams" do
     visit messages_path
-    wait_for_subscriber
+    subscribe_to_broadcasts
 
-    assert_text "Messages"
-    assert_broadcasts_text "Message 1" do |text|
-      Message.create(content: text).broadcast_append_to(:messages)
+    assert_broadcasts_text "Message 1", to: :messages do |text, target|
+      Message.create(content: text).broadcast_append_to(target)
     end
   end
 
-  test "New messages update the message count with html" do
+  test "Message broadcasts with html: render option" do
     visit messages_path
-    wait_for_subscriber
-
-    assert_text "Messages"
-    message = Message.create(content: "A new message")
+    subscribe_to_broadcasts
 
-    message.broadcast_update_to(:messages, target: "message-count",
-      html: "#{Message.count} messages sent")
-    assert_selector("#message-count", text: Message.count, wait: 10)
+    assert_broadcasts_text "Hello, with html: option", to: :messages do |text, target|
+      Message.create(content: "Ignored").broadcast_append_to(target, html: text)
+    end
   end
 
   test "Users::Profile broadcasts Turbo Streams" do
     visit users_profiles_path
-    wait_for_subscriber
+    subscribe_to_broadcasts
 
-    assert_text "Users::Profiles"
-    assert_broadcasts_text "Profile 1" do |text|
-      Users::Profile.new(id: 1, name: text).broadcast_append_to(:users_profiles)
+    assert_broadcasts_text "Profile 1", to: :users_profiles do |text, target|
+      Users::Profile.new(id: 1, name: text).broadcast_append_to(target)
     end
   end
 
   test "passing extra parameters to channel" do
     visit echo_messages_path
-    wait_for_subscriber
 
-    assert_text "Hello, world!", wait: 100
+    assert_broadcasts_text "Hello, world!", to: :messages do
+      subscribe_to_broadcasts
+    end
   end
 
   private
 
-  def assert_broadcasts_text(text, wait: 5, &block)
-    assert_no_text text
-    perform_enqueued_jobs { block.call(text) }
-    assert_text text, wait: wait
+  def subscribe_to_broadcasts
+    click_on "Start listening for broadcasts"
+
+    assert_no_button "Start listening for broadcasts"
+
+    Timeout.timeout(Capybara.default_max_wait_time) { wait_for_subscriber }
+  end
+
+  def assert_broadcasts_text(text, to:, &block)
+    within(:element, id: to) { assert_no_text text }
+
+    [text, to].yield_self(&block)
+
+    within(:element, id: to) { assert_text text }
   end
 
-  def wait_for_subscriber(timeout: 10)
-    time = Time.now
+  def wait_for_subscriber
     loop do
-      subscriber_map = pubsub_adapter.instance_variable_get(:@subscriber_map)
+      subscriber_map = ActionCable.server.pubsub.instance_variable_get(:@subscriber_map)
       if subscriber_map.is_a?(ActionCable::SubscriptionAdapter::SubscriberMap)
         subscribers = subscriber_map.instance_variable_get(:@subscribers)
         sync = subscriber_map.instance_variable_get(:@sync)
@@ -63,9 +64,7 @@ def wait_for_subscriber(timeout: 10)
           return unless subscribers.empty?
         end
       end
-      assert_operator(Time.now - time, :<, timeout, "subscriber waiting timed out")
       sleep 0.1
     end
   end
-
 end
diff --git a/test/system/form_submissions_test.rb b/test/system/form_submissions_test.rb
index f0745711..4fa80ecc 100644
--- a/test/system/form_submissions_test.rb
+++ b/test/system/form_submissions_test.rb
@@ -15,7 +15,8 @@ class FormSubmissionsTest < ApplicationSystemTestCase
     article = Article.create! body: "My article"
 
     visit edit_article_path(article.id)
-    fill_in("Body", with: "My edit").then { click_on "Submit as PATCH" }
+    fill_in "Body", with: "My edit", fill_options: { clear: :backspace }
+    click_on "Submit as PATCH"
 
     assert_text "Articles"
     assert_text "My edit", count: 1
diff --git a/test/turbo_test.rb b/test/test_helper.rb
similarity index 69%
rename from test/turbo_test.rb
rename to test/test_helper.rb
index a3c070aa..bc2878b8 100644
--- a/test/turbo_test.rb
+++ b/test/test_helper.rb
@@ -1,18 +1,15 @@
+# Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require "minitest/autorun"
-require "rails"
+require_relative "../test/dummy/config/environment"
+ActiveRecord::Migrator.migrations_paths = [File.expand_path("../test/dummy/db/migrate", __dir__)]
 require "rails/test_help"
-require "byebug"
-
-require_relative "dummy/config/environment"
 
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../test/dummy/db/migrate", __dir__)]
 ActionCable.server.config.logger = Logger.new(STDOUT) if ENV["VERBOSE"]
 
 module ActionViewTestCaseExtensions
-  def render(*arguments, **options, &block)
-    ApplicationController.renderer.render(*arguments, **options, &block)
+  def render(...)
+    ApplicationController.renderer.render(...)
   end
 end