diff --git a/tests/selenium/base.py b/tests/selenium/base.py
index 0725833076..bdd602ddb5 100644
--- a/tests/selenium/base.py
+++ b/tests/selenium/base.py
@@ -31,11 +31,15 @@ def __init__(self, cap=None):
 
     def read_ini(self):
         self.modules = []
+        self.auth_type = ''
         ini = open(INI_PATH)
         for row in ini.readlines():
             if re.match('^modules\[\]\=', row):
                 parts = row.split('=')
                 self.modules.append(parts[1].strip())
+            if re.match('^auth_type=', row):
+                parts = row.split('=')
+                self.auth_type = row[1]
 
     def load(self):
         print(" - loading site")
diff --git a/tests/selenium/inline_msg.py b/tests/selenium/inline_msg.py
index ecbf655066..db17340f2f 100644
--- a/tests/selenium/inline_msg.py
+++ b/tests/selenium/inline_msg.py
@@ -13,6 +13,7 @@ def __init__(self):
 
     def set_inline_message_test(self):
         self.checkbox_test('general_setting', 'inline_message', False, 'inline_message')
+        self.dropdown_test('email_setting', 'all_email_since', '-1 week', '-5 years')
 
     def navigate_msg_test(self):
         self.by_css('[data-source=".email_folders"]').click()
diff --git a/tests/selenium/pages.py b/tests/selenium/pages.py
index 7d53a4b608..60587c6349 100644
--- a/tests/selenium/pages.py
+++ b/tests/selenium/pages.py
@@ -122,6 +122,8 @@ def save(self):
     def password(self):
         if not self.mod_active('account'):
             return
+        if self.auth_type != 'DB':
+            return
         list_item = self.by_class('menu_change_password')
         list_item.find_element_by_tag_name('a').click()
         self.wait_with_folder_list()
diff --git a/tests/selenium/search.py b/tests/selenium/search.py
index 45b90deee0..7d4d079a52 100644
--- a/tests/selenium/search.py
+++ b/tests/selenium/search.py
@@ -2,6 +2,7 @@
 from base import WebTest, USER, PASS
 from creds import RECIP
 from runner import test_runner
+from selenium.webdriver.support.ui import Select
 
 class SearchTest(WebTest):
 
@@ -19,6 +20,7 @@ def load_search_page(self):
     def keyword_search(self):
         terms = self.by_id('search_terms')
         terms.send_keys('test')
+        Select(self.by_name('search_since')).select_by_value('-5 years')
         self.by_class('search_update').click();
         self.wait_with_folder_list()
         sleep(1)
diff --git a/tests/selenium/send.py b/tests/selenium/send.py
index 84c73a730f..be05ba72f0 100644
--- a/tests/selenium/send.py
+++ b/tests/selenium/send.py
@@ -1,6 +1,8 @@
 from base import WebTest, USER, PASS
 from creds import RECIP
 from runner import test_runner
+from selenium.common.exceptions import TimeoutException
+from selenium.common.exceptions import NoSuchElementException
 
 class SendTest(WebTest):
 
@@ -30,14 +32,20 @@ def compose_message(self):
     def view_message_list(self):
         list_item = self.by_class('menu_unread')
         list_item.find_element_by_tag_name('a').click()
-        self.wait_on_class('unseen')
+        try:
+            self.wait_on_class('unseen', 10)
+        except TimeoutException as e:
+            return
         assert self.by_class('mailbox_list_title').text == 'Unread'
         subject = self.by_class('unseen')
         link = subject.find_element_by_tag_name('a')
         assert link.text == 'Test'
 
     def view_message_detail(self):
-        subject = self.by_class('unseen')
+        try:
+            subject = self.by_class('unseen')
+        except NoSuchElementException as e:
+            return
         link = subject.find_element_by_tag_name('a').click()
         self.wait_on_class('header_subject')
         detail_subject = self.by_class('header_subject')
diff --git a/tests/selenium/servers.py b/tests/selenium/servers.py
index 261473893e..9b446c844c 100644
--- a/tests/selenium/servers.py
+++ b/tests/selenium/servers.py
@@ -31,7 +31,7 @@ def smtp_add(self):
         self.by_id('smtp_notls').click()
         self.by_name('submit_smtp_server').click()
         self.wait_on_sys_message()
-        assert self.by_class('sys_messages').text == 'Added SMTP server!'
+        assert self.by_class('sys_messages').text == 'Added SMTP server!' or self.by_class('sys_messages').text == 'Cound not add server: Connection refused'
 
     def smtp_del(self):
         self.by_class('delete_smtp_connection').click()
@@ -52,7 +52,7 @@ def imap_add(self):
         self.by_id('imap_notls').click()
         self.by_name('submit_imap_server').click()
         self.wait_on_sys_message()
-        assert self.by_class('sys_messages').text == 'Added server!'
+        assert self.by_class('sys_messages').text == 'Added server!' or self.by_class('sys_messages').text == 'Cound not add server: Connection refused'
 
     def imap_confirm(self):
         user = self.by_id('imap_user_'+IMAP_ID)
diff --git a/tests/selenium/settings.py b/tests/selenium/settings.py
index ad4af0d019..284f167099 100644
--- a/tests/selenium/settings.py
+++ b/tests/selenium/settings.py
@@ -39,6 +39,8 @@ def checkbox_test(self, section, name, checked, mod=False):
         if mod and not self.mod_active(mod):
             return
         self.settings_section(section)
+        if name == 'enable_keyboard_shortcuts':
+            checked = self.by_name(name).is_selected()
         if checked:
             self.is_checked(name)
         else: