diff --git a/test/browser/prefereces_test.rb b/test/browser/prefereces_test.rb
index 2f4a03ea4..72c73245d 100644
--- a/test/browser/prefereces_test.rb
+++ b/test/browser/prefereces_test.rb
@@ -269,10 +269,12 @@ class PreferencesTest < TestCase
       :css   => 'body',
       :value => 'Sprache',
     )
-    sleep 4
+    sleep 6
 
     # check if language is still used after reload
     reload()
+    sleep 2
+
     watch_for(
       :css   => 'body',
       :value => 'Sprache',
diff --git a/test/browser/setting_test.rb b/test/browser/setting_test.rb
index abb1a676b..04280f2d1 100644
--- a/test/browser/setting_test.rb
+++ b/test/browser/setting_test.rb
@@ -26,17 +26,23 @@ class SettingTest < TestCase
     click( :css => 'a[href="#manage"]' )
     click( :css => 'a[href="#settings/security"]' )
     click( :css => 'a[href="#third_party_auth"]' )
+    sleep 2
 
     # set yes
     select(
-      :css     => '#auth_facebook select[name="{boolean}auth_facebook"]',
-      :value   => 'yes',
+      :css   => '#auth_facebook select[name="{boolean}auth_facebook"]',
+      :value => 'yes',
+    )
+    match(
+      :css   => '#auth_facebook select[name="{boolean}auth_facebook"]',
+      :value => 'yes',
     )
     click( :css => '#auth_facebook button[type=submit]' )
     watch_for(
       :css   => '#notify',
       :value => 'update successful',
     )
+    sleep 4
     match(
       :css   => '#auth_facebook select[name="{boolean}auth_facebook"]',
       :value => 'yes',
@@ -56,6 +62,7 @@ class SettingTest < TestCase
       :css   => '#notify',
       :value => 'update successful',
     )
+    sleep 4
     match(
       :css   => '#auth_facebook select[name="{boolean}auth_facebook"]',
       :value => 'no',
@@ -79,6 +86,7 @@ class SettingTest < TestCase
       :css   => '#notify',
       :value => 'update successful',
     )
+    sleep 4
     match(
       :css   => '#auth_facebook_credentials input[name=app_id]',
       :value => 'id_test1234äöüß',
@@ -102,6 +110,7 @@ class SettingTest < TestCase
       :css   => '#notify',
       :value => 'update successful',
     )
+    sleep 4
     match(
       :css   => '#auth_facebook_credentials input[name=app_id]',
       :value => '---',
@@ -122,4 +131,4 @@ class SettingTest < TestCase
       :value => '---',
     )
   end
-end
+end
\ No newline at end of file