diff --git a/test/browser/agent_ticket_actions_level1_test.rb b/test/browser/agent_ticket_actions_level1_test.rb
index 8d3df0f6d..0a1046ae8 100644
--- a/test/browser/agent_ticket_actions_level1_test.rb
+++ b/test/browser/agent_ticket_actions_level1_test.rb
@@ -54,7 +54,7 @@ class AgentTicketActionLevel1Test < TestCase
           },
           {
             :execute => 'click',
-            :css     => '.active button',
+            :css     => '.active button.submit',
           },
           {
             :execute => 'wait',
@@ -111,7 +111,7 @@ class AgentTicketActionLevel1Test < TestCase
           },
           {
             :execute => 'click',
-            :css     => '.content_permanent.active button',
+            :css     => '.content_permanent.active button.submit',
           },
           {
             :execute => 'wait',
@@ -136,6 +136,10 @@ class AgentTicketActionLevel1Test < TestCase
       {
         :name     => 'agent ticket merge',
         :action   => [
+          {
+            :execute => 'click',
+            :css     => '.active .action',
+          },
           {
             :execute => 'click',
             :css     => '.active a[data-type="merge"]',
diff --git a/test/browser/agent_ticket_actions_level2_test.rb b/test/browser/agent_ticket_actions_level2_test.rb
index 7e391fd45..9a47f6c0b 100644
--- a/test/browser/agent_ticket_actions_level2_test.rb
+++ b/test/browser/agent_ticket_actions_level2_test.rb
@@ -237,7 +237,7 @@ class AgentTicketActionsLevel2Test < TestCase
           {
             :where   => :instance1,
             :execute => 'click',
-            :css     => '.active button',
+            :css     => '.active button.submit',
           },
           {
             :execute => 'wait',
diff --git a/test/browser/agent_user_manage_test.rb b/test/browser/agent_user_manage_test.rb
index 01e15771b..969251e6d 100644
--- a/test/browser/agent_user_manage_test.rb
+++ b/test/browser/agent_user_manage_test.rb
@@ -52,7 +52,7 @@ class AgentUserManageTest < TestCase
           },
           {
             :execute => 'click',
-            :css     => '.modal button',
+            :css     => '.modal button.submit',
           },
           {
             :execute => 'wait',
diff --git a/test/browser/maintenance_message_test.rb b/test/browser/maintenance_message_test.rb
index 4cba5d562..e33617a9d 100644
--- a/test/browser/maintenance_message_test.rb
+++ b/test/browser/maintenance_message_test.rb
@@ -22,12 +22,12 @@ class MaintenanceMessageTest < TestCase
           {
             :where   => :instance1,
             :execute => 'click',
-            :css     => 'a[href="#admin"]',
+            :css     => 'a[href="#manage"]',
           },
           {
             :where   => :instance1,
             :execute => 'click',
-            :css     => 'a[href="#maintenance"]',
+            :css     => 'a[href="#system/maintenance"]',
           },
           {
             :where   => :instance1,
@@ -87,12 +87,12 @@ class MaintenanceMessageTest < TestCase
           {
             :where   => :instance1,
             :execute => 'click',
-            :css     => 'a[href="#admin"]',
+            :css     => 'a[href="#manage"]',
           },
           {
             :where   => :instance1,
             :execute => 'click',
-            :css     => 'a[href="#maintenance"]',
+            :css     => 'a[href="#system/maintenance"]',
           },
           {
             :where   => :instance1,
@@ -152,12 +152,12 @@ class MaintenanceMessageTest < TestCase
           {
             :where   => :instance1,
             :execute => 'click',
-            :css     => 'a[href="#admin"]',
+            :css     => 'a[href="#manage"]',
           },
           {
             :where   => :instance1,
             :execute => 'click',
-            :css     => 'a[href="#maintenance"]',
+            :css     => 'a[href="#system/maintenance"]',
           },
           {
             :where   => :instance1,
diff --git a/test/browser/prefereces_test.rb b/test/browser/prefereces_test.rb
index 2cff29c65..c28aab939 100644
--- a/test/browser/prefereces_test.rb
+++ b/test/browser/prefereces_test.rb
@@ -27,23 +27,14 @@ class PreferencesTest < TestCase
             :execute => 'wait',
             :value   => 1,
           },
-          {
-            :execute => 'check',
-            :css     => '#language',
-            :result  => true,
-          },
-          {
-            :execute => 'wait',
-            :value   => 2,
-          },
           {
             :execute => 'select',
-            :css     => '#language select[name="locale"]',
+            :css     => '.language_item select[name="locale"]',
             :value   => 'Deutsch',
           },
           {
             :execute => 'click',
-            :css     => '#language button',
+            :css     => '.content button[type="submit"]',
           },
           {
             :execute => 'wait',
@@ -62,12 +53,12 @@ class PreferencesTest < TestCase
           },
           {
             :execute => 'select',
-            :css     => '#language select[name="locale"]',
+            :css     => '.language_item select[name="locale"]',
             :value   => 'English (United States)',
           },
           {
             :execute => 'click',
-            :css     => '#language button',
+            :css     => '.content button[type="submit"]',
           },
           {
             :execute => 'wait',
diff --git a/test/browser/setting_test.rb b/test/browser/setting_test.rb
index 6ca5eaa40..45756bc42 100644
--- a/test/browser/setting_test.rb
+++ b/test/browser/setting_test.rb
@@ -9,7 +9,7 @@ class SettingTest < TestCase
         :action   => [
           {
             :execute => 'click',
-            :css     => 'a[href="#settings"]',
+            :css     => 'a[href="#manage"]',
           },
           {
             :execute => 'click',
diff --git a/test/browser/text_module_test.rb b/test/browser/text_module_test.rb
index 8bd889832..551155225 100644
--- a/test/browser/text_module_test.rb
+++ b/test/browser/text_module_test.rb
@@ -16,11 +16,11 @@ class TextModuleTest < TestCase
           },
           {
             :execute => 'click',
-            :css     => 'a[href="#admin"]',
+            :css     => 'a[href="#manage"]',
           },
           {
             :execute => 'click',
-            :css     => 'a[href="#text_modules"]',
+            :css     => 'a[href="#manage/text_modules"]',
           },
           {
             :execute => 'click',
@@ -28,17 +28,17 @@ class TextModuleTest < TestCase
           },
           {
             :execute => 'set',
-            :css     => 'input[name=name]',
+            :css     => '.modal input[name=name]',
             :value   => 'some name' + random,
           },
           {
             :execute => 'set',
-            :css     => 'input[name="keywords"]',
+            :css     => '.modal input[name="keywords"]',
             :value   => random,
           },
           {
             :execute => 'set',
-            :css     => 'textarea[name="content"]',
+            :css     => '.modal textarea[name="content"]',
             :value   => 'some content' + random,
           },
           {
@@ -62,11 +62,11 @@ class TextModuleTest < TestCase
         :action   => [
           {
             :execute => 'click',
-            :css     => 'a[href="#admin"]',
+            :css     => 'a[href="#manage"]',
           },
           {
             :execute => 'click',
-            :css     => 'a[href="#text_modules"]',
+            :css     => 'a[href="#manage/text_modules"]',
           },
           {
             :execute => 'click',
@@ -74,17 +74,17 @@ class TextModuleTest < TestCase
           },
           {
             :execute => 'set',
-            :css     => 'input[name=name]',
+            :css     => '.modal input[name=name]',
             :value   => 'some name' + random2,
           },
           {
             :execute => 'set',
-            :css     => 'input[name="keywords"]',
+            :css     => '.modal input[name="keywords"]',
             :value   => random2,
           },
           {
             :execute => 'set',
-            :css     => 'textarea[name="content"]',
+            :css     => '.modal textarea[name="content"]',
             :value   => 'some content' + random2,
           },
           {
@@ -208,12 +208,12 @@ class TextModuleTest < TestCase
           {
             :where   => :instance1,
             :execute => 'click',
-            :css     => 'a[href="#admin"]',
+            :css     => 'a[href="#manage"]',
           },
           {
             :where   => :instance1,
             :execute => 'click',
-            :css     => 'a[href="#text_modules"]',
+            :css     => 'a[href="#manage/text_modules"]',
           },
           {
             :where   => :instance1,
@@ -223,19 +223,19 @@ class TextModuleTest < TestCase
           {
             :where   => :instance1,
             :execute => 'set',
-            :css     => 'input[name=name]',
+            :css     => '.modal input[name=name]',
             :value   => 'some name' + random,
           },
           {
             :where   => :instance1,
             :execute => 'set',
-            :css     => 'input[name="keywords"]',
+            :css     => '.modal input[name="keywords"]',
             :value   => random,
           },
           {
             :where   => :instance1,
             :execute => 'set',
-            :css     => 'textarea[name="content"]',
+            :css     => '.modal textarea[name="content"]',
             :value   => 'some content <%= @ticket.customer.lastname %>' + random,
           },
           {