diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index 01a45f341..0188eb46f 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -552,7 +552,12 @@ class TestCase < Test::Unit::TestCase
     log('modal_ready', params)
 
     instance = params[:browser] || @browser
-    sleep 3
+
+    watch_for(
+      browser: instance,
+      css:     '.modal.in',
+      timeout: params[:timeout] || 4,
+    )
   end
 
 =begin