diff --git a/test/browser/abb_one_group_test.rb b/test/browser/abb_one_group_test.rb
index 0e613e362..2c58e2aff 100644
--- a/test/browser/abb_one_group_test.rb
+++ b/test/browser/abb_one_group_test.rb
@@ -88,9 +88,12 @@ class AgentTicketActionLevel0Test < TestCase
 
     # customer ticket create
     click(css: 'a[href="#new"]')
-    click(css: 'a[href="#customer_ticket_new"]', wait: 5)
+    click(css: 'a[href="#customer_ticket_new"]')
 
-    exists(css: '.newTicket')
+    watch_for(
+      css: '.newTicket',
+      value: 'New Ticket',
+    )
     exists_not(css: '.newTicket select[name="group_id"]')
 
     set(
diff --git a/test/browser/first_steps_test.rb b/test/browser/first_steps_test.rb
index 692162936..b7bc3262d 100644
--- a/test/browser/first_steps_test.rb
+++ b/test/browser/first_steps_test.rb
@@ -115,7 +115,6 @@ class FirstStepsTest < TestCase
       css: '#content .js-formSetting',
       type: 'on',
     )
-    sleep 2
     click(css: '#navigation a[href="#dashboard"]')
     hit = false
     (1..38).each {
diff --git a/test/browser/form_test.rb b/test/browser/form_test.rb
index b2c2d3555..e6b5ad08c 100644
--- a/test/browser/form_test.rb
+++ b/test/browser/form_test.rb
@@ -29,7 +29,6 @@ class FormTest < TestCase
       css: '#content .js-formSetting',
       type: 'off',
     )
-    sleep 2
 
     customer = browser_instance
     location(
@@ -47,7 +46,6 @@ class FormTest < TestCase
       css: '#content .js-formSetting',
       type: 'on',
     )
-    sleep 2
 
     reload(
       browser: customer,
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index eb3e3ea36..9fc85b584 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -649,9 +649,11 @@ class TestCase < Test::Unit::TestCase
     if !checked
       if params[:type] == 'on'
         instance.find_elements(css: "#{params[:css]} label")[0].click
+        sleep 2
       end
     elsif params[:type] == 'off'
       instance.find_elements(css: "#{params[:css]} label")[0].click
+      sleep 2
     end
   end