diff --git a/frontend/user/vue-components/ApplicationLabel.vue b/frontend/user/vue-components/ApplicationLabel.vue
index 20a08f107..592fa9718 100644
--- a/frontend/user/vue-components/ApplicationLabel.vue
+++ b/frontend/user/vue-components/ApplicationLabel.vue
@@ -1,6 +1,6 @@
 <template>
   <ul v-if="currentApp !== null" class="nav navbar-nav">
-    <li class="dropdown notifications-menu">
+    <li id="application-settings" class="dropdown notifications-menu">
       <a href="#" class="dropdown-toggle cust-padding" data-toggle="dropdown" aria-expanded="false">
         <img class="app-icon"
         :src="currentApp.appData.image.icon_128 | iconSrc">
diff --git a/frontend/user/vue-components/ApplicationListView.vue b/frontend/user/vue-components/ApplicationListView.vue
index 81a097f0b..db3be032c 100644
--- a/frontend/user/vue-components/ApplicationListView.vue
+++ b/frontend/user/vue-components/ApplicationListView.vue
@@ -2,7 +2,7 @@
   <section class="sidebar">
     <!-- Search form -->
     <form action="#" class="sidebar-form">
-      <input type="text" name="q" class="form-control" placeholder="Search..." v-model="searchInput">
+      <input id="search-input" type="text" name="q" class="form-control" placeholder="Search..." v-model="searchInput">
     </form>
 
     <!-- Sidebar Menu -->
@@ -28,6 +28,7 @@
     <transition-group name="list" tag="ul" id="applistentries" class="sidebar-menu">
       <li v-for="app in visibleList" v-bind:key="app"
       :class="{ active: indexOf(app) === model.selectedIndex }"
+      :id="'application-entry-' + indexOf(app)"
       @click="model.selectedIndex = indexOf(app); $emit('entryClicked');">
 
         <span :class="app.status.toLowerCase() + '-badge'"></span>
diff --git a/frontend/user/vue-components/ApplicationView.vue b/frontend/user/vue-components/ApplicationView.vue
index ffd0939e6..a79a195c3 100644
--- a/frontend/user/vue-components/ApplicationView.vue
+++ b/frontend/user/vue-components/ApplicationView.vue
@@ -49,7 +49,7 @@
 
           <!-- Start Button -->
           <div class="box-footer">
-            <button class="btn btn-primary pull-right start-button"
+            <button id="start-button" class="btn btn-primary pull-right start-button"
             @click="startApplication()"
             :disabled="!currentApp.isStopped()">
               {{ {STOPPED: 'Start', STARTING: 'Starting', STOPPING: 'Stopping'}[currentApp.status] }}
diff --git a/remoteappmanager/templates/page.html b/remoteappmanager/templates/page.html
index 152a3ae0e..608a0f245 100644
--- a/remoteappmanager/templates/page.html
+++ b/remoteappmanager/templates/page.html
@@ -59,7 +59,7 @@
         <div class="navbar-custom-menu">
           <ul class="nav navbar-nav">
             <!-- User Account Menu -->
-            <li class="dropdown user user-menu">
+            <li id="user-menu" class="dropdown user user-menu">
               <!-- Menu Toggle Button -->
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                 <!-- The user image in the navbar-->
diff --git a/selenium_tests/AdminDriverTest.py b/selenium_tests/AdminDriverTest.py
new file mode 100644
index 000000000..5d96c1061
--- /dev/null
+++ b/selenium_tests/AdminDriverTest.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+from selenium_tests.RemoteAppDriverTest import RemoteAppDriverTest
+from selenium.webdriver.common.by import By
+
+
+class AdminDriverTest(RemoteAppDriverTest):
+    def setUp(self):
+        RemoteAppDriverTest.setUp(self)
+        self.login("admin")
+
+    def click_row_action_button(self, row, action_name):
+        """ Click on an action button in the datatable for a specific row
+        Parameters
+        ----------
+        row: String
+            A string which permit to locate the row, it can be:
+            - the index of the row ("2")
+            - a user name ("JohnDoe")
+            - an application name ("File Manager")
+            - a container id ("3514azd65a4z4dazd131")
+        action_name: string
+            The name of the action
+
+        Example
+        -------
+        click_row_action_button("JohnDoe", "Remove")
+        click_row_action_button("JohnDoe", "Policies")
+        click_row_action_button("Mayavi", "Stop")
+        """
+        self.click_first_element_located(
+            By.XPATH,
+            "//tr[td[text()='{}']]/td/button[text()='{}']".format(
+                row, action_name
+            )
+        )
+
+    def tearDown(self):
+        self.logout()
+        RemoteAppDriverTest.tearDown(self)
diff --git a/selenium_tests/RemoteAppDriverTest.py b/selenium_tests/RemoteAppDriverTest.py
new file mode 100644
index 000000000..ce9331413
--- /dev/null
+++ b/selenium_tests/RemoteAppDriverTest.py
@@ -0,0 +1,288 @@
+# -*- coding: utf-8 -*-
+import time
+import os
+import contextlib
+import sqlite3
+import selenium.webdriver.support.expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
+from selenium import webdriver
+from selenium.common.exceptions import NoSuchElementException
+from selenium.common.exceptions import NoAlertPresentException
+from selenium.webdriver.common.action_chains import ActionChains
+import unittest
+
+
+class RemoteAppDriverTest(unittest.TestCase):
+    def setUp(self):
+        ff_binary = webdriver.firefox.firefox_binary.FirefoxBinary()
+        ff_profile = webdriver.firefox.firefox_profile.FirefoxProfile()
+        ff_profile.assume_untrusted_cert_issuer = True
+        ff_profile.accept_untrusted_certs = True
+        capabilities = webdriver.DesiredCapabilities().FIREFOX
+        capabilities['acceptSslCerts'] = True
+        self.driver = webdriver.Firefox(firefox_binary=ff_binary,
+                                        firefox_profile=ff_profile,
+                                        capabilities=capabilities,
+                                        timeout=60)
+        self.driver.implicitly_wait(30)
+        self.wait = WebDriverWait(self.driver, 30)
+        self.base_url = "https://127.0.0.1:8000/"
+        self.verificationErrors = []
+        self.accept_next_alert = True
+
+        permissions_db_path = os.path.join(ff_profile.profile_dir,
+                                           "permissions.sqlite")
+
+        with contextlib.closing(sqlite3.connect(permissions_db_path)) as db:
+            cur = db.cursor()
+            cur.execute(
+                ("INSERT INTO moz_perms VALUES (1, '{base_url}', "
+                 "'popup', 1, 0, 0, 1474977124357)").format(
+                    base_url=self.base_url))
+            db.commit()
+
+    def wait_until_presence_of_element_located(self, how, what):
+        """ Wait until a located element is present
+        Parameters
+        ----------
+        how: String
+            How you want to locate the element. See selenium.webdriver.common.by
+        what: String
+            What you want to locate.
+
+        Returns:
+        --------
+        element:
+            The element founded
+
+        Example:
+        --------
+        start_button = wait_until_presence_of_element_located(
+            By.ID, "start-button")
+        iframe = wait_until_presence_of_element_located(By.TAG_NAME, "iframe")
+        """
+        return self.wait.until(EC.presence_of_element_located((how, what)))
+
+    def wait_until_text_inside_element_located(self, how, what, text):
+        """ Wait until a located element contains some text
+        Parameters
+        ----------
+        how: String
+            How you want to locate the element. See selenium.webdriver.common.by
+        what: String
+            What you want to locate.
+        text: String
+            The text which must be contained by the located element
+
+        Returns:
+        --------
+        element:
+            The element founded
+
+        Example:
+        --------
+        conclusion_title = wait_until_text_inside_element_located(
+            By.TAG_NAME, "h3", "Conclusion")
+        """
+        return self.wait.until(EC.text_to_be_present_in_element((how, what), text))
+
+    def wait_until_visibility_of_element_located(self, how, what):
+        """ Wait until a located element is visible, which means that it's rendered and
+        the CSS display style is not "none".
+        Parameters
+        ----------
+        how: String
+            How you want to locate the element. See selenium.webdriver.common.by
+        what: String
+            What you want to locate.
+
+        Returns:
+        --------
+        element:
+            The element founded
+
+        Example:
+        --------
+        button = wait_until_visibility_of_element_located(By.TAG_NAME, "button")
+        """
+        return self.wait.until(EC.visibility_of_element_located((how, what)))
+
+    def wait_until_visibility_of(self, element):
+        """ Wait until an element is visible, which means that it's rendered and
+        the CSS display style is not "none".
+        Parameters
+        ----------
+        element: WebElement
+            The web element which is supposed to be visible
+
+        Returns:
+        --------
+        element:
+            The element
+
+        Example:
+        --------
+        wait_until_visibility_of(my_button)
+        """
+        return self.wait.until(EC.visibility_of(element))
+
+    def wait_until_invisibility_of_element_located(self, how, what):
+        """ Wait until an element is invisible, which means that it's not rendered or
+        the CSS display style is "none".
+        Parameters
+        ----------
+        how: String
+            How you want to locate the element. See selenium.webdriver.common.by
+        what: String
+            What you want to locate.
+
+        Returns:
+        --------
+        element:
+            The element founded
+
+        Example:
+        --------
+        button = wait_until_invisibility_of_element_located(By.TAG_NAME, "button")
+        """
+        return self.wait.until(EC.invisibility_of_element_located((how, what)))
+
+    def wait_until_clickability_of_element_located(self, how, what):
+        """ Wait until an element is clickable, which means that it's visible,
+        enabled and nothing is above this element.
+        Parameters
+        ----------
+        how: String
+            How you want to locate the element. See selenium.webdriver.common.by
+        what: String
+            What you want to locate.
+
+        Returns:
+        --------
+        element:
+            The element founded
+
+        Example:
+        --------
+        button = wait_until_clickability_of_element_located(By.TAG_NAME, "button")
+        button.click()
+        """
+        return self.wait.until(EC.element_to_be_clickable((how, what)))
+
+    def click_first_element_located(self, how, what):
+        """ Wait until an element is clickable and click it
+        Parameters
+        ----------
+        how: String
+            How you want to locate the element. See selenium.webdriver.common.by
+        what: String
+            What you want to locate.
+
+        Example:
+        --------
+        click_first_element_located(By.TAG_NAME, "button")
+        """
+        element = self.wait_until_clickability_of_element_located(how, what)
+        element.click()
+
+    def click_first_button(self, name):
+        """ Click the first founded button containing a given name. If the button
+        is not clickable, it will wait until it is and then click it.
+        Parameters
+        ----------
+        name: String
+            The name of the button you want to click
+
+        Example:
+        --------
+        click_first_button("Ok")
+        click_first_button("Remove")
+        """
+        self.click_first_element_located(
+            By.XPATH, "//button[text()='{}']".format(name)
+        )
+
+    def type_text_in_element_located(self, how, what, text):
+        """ Type text into an located element.
+        Parameters
+        ----------
+        how: String
+            How you want to locate the element. See selenium.webdriver.common.by
+        what: String
+            What you want to locate.
+        text: String
+            The text that you want to type in the element
+
+        Example:
+        --------
+            type_text_in_element_located(By.TAG_NAME, "input", "Hello World!")
+        """
+        element = self.wait_until_clickability_of_element_located(how, what)
+        element.clear()
+        element.send_keys(text)
+
+    def wait_until_modal_closed(self):
+        """ Wait until the modal dialog is closed. We assume here that only
+        one modal dialog/alert dialog can be opened at the same time.
+        Returns
+        -------
+        element: WebElement
+            The modal dialog
+        """
+        return self.wait.until_not(EC.alert_is_present())
+
+    def click_modal_footer_button(self, name):
+        """ Click the first founded button containing a given name in the modal
+        footer and then wait until the modal dialog is closed. We assume here
+        that only one modal dialog can be opened at the same time and that it
+        contains a footer with buttons. We also assume that whatever the button
+        does, it will close the modal dialog.
+        Parameters
+        ----------
+        name: String
+            The name of the button you want to click
+
+        Example:
+        --------
+        click_modal_footer_button("Ok")
+        click_modal_footer_button("Submit")
+        click_modal_footer_button("Cancel")
+        """
+        self.click_first_element_located(
+            By.XPATH, "//div[contains(@class,'modal-footer')]/button[text()='{}']".format(name)
+        )
+        self.wait_until_modal_closed()
+
+    def login(self, username="test"):
+        """ Login as a given user name. We assume that if you use this routine,
+        you are currently on the login page.
+        Parameters
+        ----------
+        username: String
+            The name of the user, it can be "admin" if you want to login as admin.
+
+        Example:
+        --------
+        login("JohnDoe")
+        login("admin")
+        """
+        self.driver.get(self.base_url + "/hub/login")
+
+        self.type_text_in_element_located(By.ID, "username_input", username)
+        self.type_text_in_element_located(By.ID, "password_input", username)
+
+        self.click_first_element_located(By.ID, "login_submit")
+
+    def logout(self):
+        """ Logout. We assume that if you use this routine you are currently on
+        the main page, and that the user-menu is clickable (which means that
+        there is no modal dialog in front of it).
+        """
+        self.click_first_element_located(By.ID, "user-menu")
+        self.click_first_element_located(By.ID, "logout")
+        self.wait_until_text_inside_element_located(By.CSS_SELECTOR, "div.auth-form-header", "Sign in")
+
+    def tearDown(self):
+        self.driver.quit()
+        self.assertEqual([], self.verificationErrors)
diff --git a/selenium_tests/UserDriverTest.py b/selenium_tests/UserDriverTest.py
new file mode 100644
index 000000000..23538d584
--- /dev/null
+++ b/selenium_tests/UserDriverTest.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+import contextlib
+from selenium_tests.RemoteAppDriverTest import RemoteAppDriverTest
+from selenium.webdriver.common.by import By
+
+
+class UserDriverTest(RemoteAppDriverTest):
+    def setUp(self):
+        RemoteAppDriverTest.setUp(self)
+        self.login("test")
+
+    def select_application(self, index=0):
+        """ Select an application in the application list by clicking on it.
+        Parameters
+        ----------
+        index: Integer
+            The index of the application you want to select
+
+        Example
+        -------
+        select_application(1)
+        select_application(0)
+        """
+        self.click_first_element_located(By.ID, "application-entry-{}".format(index))
+
+    def open_application_settings(self):
+        """ Open the application settings dropdown.
+        """
+        self.click_first_element_located(By.ID, "application-settings")
+
+    def stop_application(self):
+        """ Click on the stop button. It assumes that the application settings
+        menu is opened and that the application is running. This will stop the
+        currently selected application.
+        """
+        self.click_first_element_located(By.ID, "stop-button")
+
+    def start_application(self):
+        """ Click on the start button. It assumes that the currently selected
+        application is stopped.
+        """
+        self.click_first_element_located(By.ID, "start-button")
+
+    def wait_until_application_running(self):
+        """ Wait until the currently selected application is running.
+        """
+        self.wait_until_presence_of_element_located(By.ID, "application")
+
+    def wait_until_application_stopped(self):
+        """ Wait until the currently selected application is stopped.
+        """
+        self.wait_until_text_inside_element_located(By.ID, "start-button", "Start")
+
+    def wait_until_application_list_loaded(self):
+        """ Wait until the application list is completely loaded and displayed
+        """
+        self.wait_until_invisibility_of_element_located(By.ID, "loading-spinner")
+
+    @contextlib.contextmanager
+    def running_container(self, index=0):
+        """ Context manager with a running application at the given index. The
+        application is stopped at the end.
+        """
+        self.wait_until_application_list_loaded()
+
+        self.select_application(index)
+        self.start_application()
+
+        try:
+            yield
+        finally:
+            self.select_application(index)
+            self.wait_until_application_running()
+            self.open_application_settings()
+            self.stop_application()
+            self.wait_until_application_stopped()
+
+    def tearDown(self):
+        self.logout()
+        RemoteAppDriverTest.tearDown(self)
diff --git a/selenium_tests/selenium_test_base.py b/selenium_tests/selenium_test_base.py
deleted file mode 100644
index 4a3b11a55..000000000
--- a/selenium_tests/selenium_test_base.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# -*- coding: utf-8 -*-
-import time
-import os
-import contextlib
-import sqlite3
-from selenium import webdriver
-from selenium.common.exceptions import NoSuchElementException
-from selenium.common.exceptions import NoAlertPresentException
-from selenium.webdriver.common.action_chains import ActionChains
-import unittest
-
-
-class SeleniumTestBase(unittest.TestCase):
-    def setUp(self):
-        ff_binary = webdriver.firefox.firefox_binary.FirefoxBinary()
-        ff_profile = webdriver.firefox.firefox_profile.FirefoxProfile()
-        ff_profile.assume_untrusted_cert_issuer = True
-        ff_profile.accept_untrusted_certs = True
-        capabilities = webdriver.DesiredCapabilities().FIREFOX
-        capabilities['acceptSslCerts'] = True
-        self.driver = webdriver.Firefox(firefox_binary=ff_binary,
-                                        firefox_profile=ff_profile,
-                                        capabilities=capabilities,
-                                        timeout=60)
-        self.driver.implicitly_wait(30)
-        self.base_url = "https://127.0.0.1:8000/"
-        self.verificationErrors = []
-        self.accept_next_alert = True
-
-        permissions_db_path = os.path.join(ff_profile.profile_dir,
-                                           "permissions.sqlite")
-
-        with contextlib.closing(sqlite3.connect(permissions_db_path)) as db:
-            cur = db.cursor()
-            cur.execute(
-                ("INSERT INTO moz_perms VALUES (1, '{base_url}', "
-                 "'popup', 1, 0, 0, 1474977124357)").format(
-                    base_url=self.base_url))
-            db.commit()
-
-    def is_element_present(self, how, what):
-        try:
-            self.driver.find_element(by=how, value=what)
-        except NoSuchElementException as e:
-            return False
-        return True
-
-    def is_alert_present(self):
-        try:
-            self.driver.switch_to_alert()
-        except NoAlertPresentException as e:
-            return False
-        return True
-
-    def close_alert_and_get_its_text(self):
-        try:
-            alert = self.driver.switch_to_alert()
-            alert_text = alert.text
-            if self.accept_next_alert:
-                alert.accept()
-            else:
-                alert.dismiss()
-            return alert_text
-        finally:
-            self.accept_next_alert = True
-
-    def wait_for(self, check_func, timeout=30):
-        for i in range(timeout):
-            try:
-                if check_func():
-                    break
-            except:
-                pass
-            time.sleep(1)
-        else:
-            self.fail("time out")
-
-    def click_by_css_selector(self, css_selector):
-        # Workaround for some unexpected behavior with clicking some elements.
-        self.driver.execute_script(
-            "arguments[0].click()",
-            self.driver.find_element_by_css_selector(css_selector))
-
-    def click_button(self, button_text, number=0):
-        """
-        Clicks a button with a given text.
-
-        Parameters
-        ----------
-        button_text: str
-            The text of the button
-        number: int
-            If multiple buttons with the same label are found, click
-            the number-th (zero based). If not specified, the first (0th)
-            button will be clicked.
-        """
-        self.wait_for(
-            lambda: len(self.get_buttons_by_text(button_text)) > number)
-
-        button = self.get_buttons_by_text(button_text)[number]
-        self.driver.execute_script("arguments[0].click()", button)
-
-    def get_buttons_by_text(self, text):
-        return [button for button in self.driver.find_elements_by_tag_name("button")
-                if button.text == text]
-
-    def tearDown(self):
-        self.driver.quit()
-        self.assertEqual([], self.verificationErrors)
-
-    @contextlib.contextmanager
-    def login(self, username="test"):
-        driver = self.driver
-        driver.get(self.base_url + "/hub/login")
-
-        driver.find_element_by_id("username_input").clear()
-        driver.find_element_by_id("username_input").send_keys(username)
-        driver.find_element_by_id("password_input").clear()
-        driver.find_element_by_id("password_input").send_keys(username)
-        driver.find_element_by_id("login_submit").click()
-
-        try:
-            yield
-        finally:
-            driver.find_element_by_css_selector(".user-menu").click()
-            driver.find_element_by_id("logout").click()
-            self.wait_for(
-                lambda: "Sign in" == driver.find_element_by_css_selector(
-                    "div.auth-form-header").text
-            )
-
-    @contextlib.contextmanager
-    def running_container(self):
-        with self.login():
-            driver = self.driver
-            self.wait_for(lambda:
-                          driver.find_element_by_css_selector(
-                              "#loading-spinner").value_of_css_property(
-                                  'display') == "none")
-
-            self.click_by_css_selector("#applistentries > li > a > img")
-            self.click_by_css_selector(".start-button")
-
-            try:
-                yield
-            finally:
-                driver.find_element_by_id("application")
-                self.click_by_css_selector(".dropdown > a > img")
-                self.click_by_css_selector("#stop-button")
diff --git a/selenium_tests/test_admin_name_header_bug.py b/selenium_tests/test_admin_name_header_bug.py
index 08825d5fb..a4f98c601 100644
--- a/selenium_tests/test_admin_name_header_bug.py
+++ b/selenium_tests/test_admin_name_header_bug.py
@@ -1,13 +1,11 @@
-from selenium_tests.selenium_test_base import SeleniumTestBase
+from selenium_tests.AdminDriverTest import AdminDriverTest
+from selenium.webdriver.common.by import By
 
 
-class TestAdminNameHeaderBug(SeleniumTestBase):
+class TestAdminNameHeaderBug(AdminDriverTest):
     def test_admin_name_header_bug(self):
-        driver = self.driver
-        with self.login("admin"):
-            driver.find_element_by_link_text("Users").click()
-            self.click_button("Policies")
-            self.wait_for(lambda:
-                "admin" == driver.find_element_by_css_selector(
-                    "span.hidden-xs").text
-            )
+        self.click_first_element_located(By.LINK_TEXT, "Users")
+
+        self.click_row_action_button("test", "Policies")
+
+        self.wait_until_text_inside_element_located(By.CSS_SELECTOR, "span.hidden-xs", "admin")
diff --git a/selenium_tests/test_create_new_user.py b/selenium_tests/test_create_new_user.py
new file mode 100644
index 000000000..8ab546a75
--- /dev/null
+++ b/selenium_tests/test_create_new_user.py
@@ -0,0 +1,22 @@
+from selenium_tests.AdminDriverTest import AdminDriverTest
+from selenium.webdriver.common.by import By
+
+
+class TestCreateNewUser(AdminDriverTest):
+    def test_cancel(self):
+        self.click_first_element_located(By.LINK_TEXT, "Users")
+
+        self.click_first_button("Create New Entry")
+        self.click_modal_footer_button("Cancel")
+
+    def test_create_and_remove_user(self):
+        self.click_first_element_located(By.LINK_TEXT, "Users")
+
+        self.click_first_button("Create New Entry")
+        self.type_text_in_element_located(By.CSS_SELECTOR, ".modal-body > form > div > input", "mrenou")
+        self.click_modal_footer_button("Submit")
+
+        # Click remove button
+        self.click_row_action_button("mrenou", "Remove")
+
+        self.click_modal_footer_button("Ok")
diff --git a/selenium_tests/test_hide_application.py b/selenium_tests/test_hide_application.py
index 0a77f2def..f706ee19c 100644
--- a/selenium_tests/test_hide_application.py
+++ b/selenium_tests/test_hide_application.py
@@ -1,22 +1,12 @@
 # -*- coding: utf-8 -*-
-from selenium_tests.selenium_test_base import SeleniumTestBase
+from selenium_tests.UserDriverTest import UserDriverTest
 from selenium.webdriver.common.by import By
 
 
-class TestHideApplication(SeleniumTestBase):
+class TestHideApplication(UserDriverTest):
     def test_hide_application(self):
-        driver = self.driver
-        with self.login():
-            self.wait_for(lambda:
-                          driver.find_element_by_css_selector(
-                              "#loading-spinner").value_of_css_property(
-                              'display') == "none")
+        self.wait_until_application_list_loaded()
 
-            # Click on the search box
-            search_box = driver.find_element_by_name("q")
-            search_box.clear()
-            search_box.send_keys('foobarheho')
+        self.type_text_in_element_located(By.ID, "search-input", "foobarheho")
 
-            self.wait_for(lambda:
-                          not self.is_element_present(
-                              By.CSS_SELECTOR, '#applistentries > li'))
+        self.wait_until_text_inside_element_located(By.ID, "applistentries", "")
diff --git a/selenium_tests/test_login_logout.py b/selenium_tests/test_login_logout.py
index 3c77a5b24..684e748c4 100644
--- a/selenium_tests/test_login_logout.py
+++ b/selenium_tests/test_login_logout.py
@@ -1,20 +1,12 @@
 # -*- coding: utf-8 -*-
-from selenium_tests.selenium_test_base import SeleniumTestBase
+from selenium_tests.RemoteAppDriverTest import RemoteAppDriverTest
+from selenium.webdriver.common.by import By
 
 
-class TestLoginLogout(SeleniumTestBase):
+class TestLoginLogout(RemoteAppDriverTest):
     def test_login_logout(self):
-        driver = self.driver
-        driver.get(self.base_url + "/hub/login")
+        self.login("test")
 
-        driver.find_element_by_id("username_input").clear()
-        driver.find_element_by_id("username_input").send_keys("test")
-        driver.find_element_by_id("password_input").clear()
-        driver.find_element_by_id("password_input").send_keys("test")
-        driver.find_element_by_id("login_submit").click()
-        driver.find_element_by_id("applistentries")
-        driver.find_element_by_css_selector(".user-menu").click()
-        driver.find_element_by_id("logout").click()
-        self.wait_for(
-            lambda: "Sign in" == driver.find_element_by_css_selector("div.auth-form-header").text
-        )
+        self.wait_until_visibility_of_element_located(By.ID, "applistentries")
+
+        self.logout()
diff --git a/selenium_tests/test_start_stop_container.py b/selenium_tests/test_start_stop_container.py
index 7cbc4ad0e..b8e005206 100644
--- a/selenium_tests/test_start_stop_container.py
+++ b/selenium_tests/test_start_stop_container.py
@@ -1,38 +1,29 @@
 # -*- coding: utf-8 -*-
-from selenium.webdriver.common.action_chains import ActionChains
-from selenium_tests.selenium_test_base import SeleniumTestBase
+from selenium_tests.UserDriverTest import UserDriverTest
+from selenium.webdriver.common.by import By
 
 
-class TestContainerInteraction(SeleniumTestBase):
+class TestContainerInteraction(UserDriverTest):
     def test_start_stop_container(self):
-        driver = self.driver
-        with self.login():
-            self.wait_for(lambda:
-                          driver.find_element_by_css_selector(
-                              "#loading-spinner").value_of_css_property(
-                              'display') == "none")
+        self.wait_until_application_list_loaded()
 
-            self.click_by_css_selector("#applistentries > li > a > img")
-            self.click_by_css_selector(".start-button")
+        self.select_application()
+        self.start_application()
+        self.wait_until_application_running()
 
-            driver.find_element_by_id("application")
-
-            self.click_by_css_selector(".dropdown > a > img")
-
-            self.click_by_css_selector("#stop-button")
+        self.open_application_settings()
+        self.stop_application()
+        self.wait_until_application_stopped()
 
     def test_focus(self):
-        driver = self.driver
         with self.running_container():
-            iframe = driver.find_element_by_css_selector("iframe")
+            iframe = self.wait_until_visibility_of_element_located(By.TAG_NAME, "iframe")
             self.assertEqual(iframe, self.driver.switch_to.active_element)
 
-            search_box = driver.find_element_by_css_selector(
-                "input.form-control")
-            ActionChains(driver).move_to_element(search_box).click().perform()
+            self.type_text_in_element_located(By.ID, "search-input", "")
 
             self.assertNotEqual(iframe, self.driver.switch_to.active_element)
 
-            self.click_by_css_selector("#applistentries > li > a > img")
+            self.select_application()
 
             self.assertEqual(iframe, self.driver.switch_to.active_element)