diff --git a/test/browser/agent_ticket_actions_level2_test.rb b/test/browser/agent_ticket_actions_level2_test.rb
index 7a44ec17e..ef7619f0b 100644
--- a/test/browser/agent_ticket_actions_level2_test.rb
+++ b/test/browser/agent_ticket_actions_level2_test.rb
@@ -216,6 +216,10 @@ class AgentTicketActionsLevel2Test < TestCase
             :execute      => 'js',
             :value        => '$(".active .ticket-title .ticket-title-update").trigger("blur")',
           },
+          {
+            :execute => 'wait',
+            :value   => 1,
+          },
 
 
           # set body in edit area
diff --git a/test/browser/taskbar_session_test.rb b/test/browser/taskbar_session_test.rb
index 7837581e7..d8bd5176d 100644
--- a/test/browser/taskbar_session_test.rb
+++ b/test/browser/taskbar_session_test.rb
@@ -16,7 +16,7 @@ class TaskbarSessionTest < TestCase
         :action   => [
           {
             :execute => 'wait',
-            :value   => 14,
+            :value   => 12,
           },
           {
             :where        => :instance1,
@@ -32,10 +32,6 @@ class TaskbarSessionTest < TestCase
             :value        => 'Reload application',
             :match_result => false,
           },
-#          {
-#            :execute => 'wait',
-#            :value   => 1,
-#          },
         ],
       },
     ]
@@ -56,7 +52,7 @@ class TaskbarSessionTest < TestCase
         :action   => [
           {
             :execute => 'wait',
-            :value   => 14,
+            :value   => 12,
           },
           {
             :where        => :instance1,
@@ -72,10 +68,6 @@ class TaskbarSessionTest < TestCase
             :value        => 'Reload application',
             :match_result => false,
           },
-#          {
-#            :execute => 'wait',
-#            :value   => 1,
-#          },
         ],
       },
     ]
diff --git a/test/browser/taskbar_task_test.rb b/test/browser/taskbar_task_test.rb
index b95bb5c8d..e34a1b843 100644
--- a/test/browser/taskbar_task_test.rb
+++ b/test/browser/taskbar_task_test.rb
@@ -42,7 +42,7 @@ class TaskbarTaskTest < TestCase
           },
           {
             :execute => 'wait',
-            :value   => 20,
+            :value   => 12,
           },
         ],
       },
@@ -135,7 +135,7 @@ class TaskbarTaskTest < TestCase
           },
           {
             :execute => 'wait',
-            :value   => 20,
+            :value   => 12,
           },
           {
             :execute => 'click',
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index 760e9d4a6..81f8b4dc8 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -25,8 +25,7 @@ class TestCase < Test::Unit::TestCase
     end
     if !ENV['REMOTE_URL']
       local_browser = Selenium::WebDriver.for( browser.to_sym )
-      local_browser.manage.window.resize_to(1024, 1024)
-      local_browser.manage.timeouts.implicit_wait = 3 # seconds
+      browser_instance_preferences(local_browser)
       @browsers.push local_browser
       return local_browser
     end
@@ -39,20 +38,25 @@ class TestCase < Test::Unit::TestCase
       :url                  => ENV['REMOTE_URL'],
       :desired_capabilities => caps,
     )
-    local_browser.manage.timeouts.implicit_wait = 3 # seconds
+    browser_instance_preferences(local_browser)
     @browsers.push local_browser
     return local_browser
   end
+  def browser_instance_preferences(local_browser)
+    local_browser.manage.window.resize_to(1024, 1024)
+    if ENV['REMOTE_URL'] !~ /saucelabs/i
+      if @browsers.size < 1
+        local_browser.manage.window.move_to(0, 0)
+      else
+        local_browser.manage.window.move_to(1024, 0)
+      end
+    end
+    local_browser.manage.timeouts.implicit_wait = 3 # seconds
+  end
 
   def teardown
     return if !@browsers
-
-    # only shut down browser type once
-    # otherwise this error will happen "Errno::ECONNREFUSED: Connection refused - connect(2)"
-    shutdown = {}
     @browsers.each{ |local_browser|
-      next if shutdown[ local_browser.browser ]
-      shutdown[ local_browser.browser ] = true
       local_browser.quit
     }
   end
@@ -171,7 +175,7 @@ class TestCase < Test::Unit::TestCase
   end
 
   def browser_element_action(test, action, instance)
-#puts "NOTICE: " + action.inspect
+puts "NOTICE: " + action.inspect
     sleep 0.2
     if action[:css]
       if action[:css].match '###stack###'