diff --git a/test/dummy/app/views/tests/drivers/_window.html.erb b/test/dummy/app/views/tests/drivers/_window.html.erb
index 7c603e2e..e469ed34 100644
--- a/test/dummy/app/views/tests/drivers/_window.html.erb
+++ b/test/dummy/app/views/tests/drivers/_window.html.erb
@@ -1,4 +1,4 @@
-<%= render "partials/details", id: "drivers-window" do %>
+<%= render "partials/details", id: "window-driver" do %>
   <summary>
     Window
     <small><code>→ app/javascript/drivers/window.js</code></small>
diff --git a/test/dummy/app/views/tests/drivers/_window.turbo_stream.erb b/test/dummy/app/views/tests/drivers/_window.turbo_stream.erb
index 26543062..b9d263c9 100644
--- a/test/dummy/app/views/tests/drivers/_window.turbo_stream.erb
+++ b/test/dummy/app/views/tests/drivers/_window.turbo_stream.erb
@@ -1,3 +1,3 @@
-<%= turbo_stream.replace "drivers-window" do %>
+<%= turbo_stream.replace "window-driver" do %>
   <%= render partial: "/tests/drivers/window", formats: [:html] %>
 <% end %>
diff --git a/test/dummy/app/views/tests/index.html.erb b/test/dummy/app/views/tests/index.html.erb
index 41287d91..66f1a7a2 100644
--- a/test/dummy/app/views/tests/index.html.erb
+++ b/test/dummy/app/views/tests/index.html.erb
@@ -8,7 +8,7 @@
     <hr>
     <%= turbo_frame_tag "method-driver-test", src: test_path(:method) %>
     <hr>
-    <%= render "/tests/drivers/window" %>
+    <div id="window-driver-test"><%= render "/tests/drivers/window" %></div>
 
   </article>
 </section>
diff --git a/test/system/tests/drivers/window_test.rb b/test/system/tests/drivers/window_test.rb
index abb69b1c..4a2c826a 100644
--- a/test/system/tests/drivers/window_test.rb
+++ b/test/system/tests/drivers/window_test.rb
@@ -3,37 +3,36 @@
 require_relative "../../../application_system_test_case"
 
 class DriversWindowTest < ApplicationSystemTestCase
+  PARENT_SELECTOR = "#window-driver-test"
   COUNT = 10
 
   def test_prevent_controller_action_command
     page.goto tests_url
-    page.wait_for_selector("#drivers-window").click
+    element("[data-test=window-driver]").click
 
-    assert_equal "...", page.wait_for_selector("#drivers-window [data-test=message]").inner_text
+    assert_equal "...", element("[data-test=message]").inner_text
 
     COUNT.times do
-      element = page.wait_for_selector("#drivers-window [data-test=prevent]")
-      element.click
-      page.wait_for_timeout 100 # TODO: change to page.expect_event("turbo-boost:command:success")
+      trigger = element("[data-test=prevent]")
+      trigger.click
+      wait_for_detach trigger
     end
 
-    assert_equal "PreventControllerActionCommand invoked #{COUNT} times",
-      page.wait_for_selector("#drivers-window [data-test=message]").inner_text
+    assert_equal "PreventControllerActionCommand invoked #{COUNT} times", element("[data-test=message]").inner_text
   end
 
   def test_allow_controller_action_command
     page.goto tests_url
-    page.wait_for_selector("#drivers-window").click
+    element("[data-test=window-driver]").click
 
-    assert_equal "...", page.wait_for_selector("#drivers-window [data-test=message]").inner_text
+    assert_equal "...", element("[data-test=message]").inner_text
 
     COUNT.times do
-      element = page.wait_for_selector("#drivers-window [data-test=allow]")
-      element.click
-      page.wait_for_timeout 100 # TODO: change to page.expect_event("turbo-boost:command:success")
+      trigger = element("[data-test=allow]")
+      trigger.click
+      wait_for_detach trigger
     end
 
-    assert_equal "AllowControllerActionCommand invoked #{COUNT} times",
-      page.wait_for_selector("#drivers-window [data-test=message]").inner_text
+    assert_equal "AllowControllerActionCommand invoked #{COUNT} times", element("[data-test=message]").inner_text
   end
 end