diff --git a/lib/galaxy/selenium/navigation.yml b/lib/galaxy/selenium/navigation.yml
index bbf6aad52d0..f35dab23a0b 100644
--- a/lib/galaxy/selenium/navigation.yml
+++ b/lib/galaxy/selenium/navigation.yml
@@ -70,6 +70,7 @@ masthead:
 
 preferences:
   selectors:
+    change_password: "#edit-preferences-password"
     manage_information: '#edit-preferences-information'
     current_email: "#user-preferences-current-email"
 
@@ -77,6 +78,10 @@ change_user_email:
   selectors:
     submit: '#submit'
 
+change_user_password:
+  selectors:
+    submit: '#submit'
+
 change_user_address:
   selectors:
     address_button:
diff --git a/lib/galaxy_test/selenium/test_change_password.py b/lib/galaxy_test/selenium/test_change_password.py
new file mode 100644
index 00000000000..f088b992b6e
--- /dev/null
+++ b/lib/galaxy_test/selenium/test_change_password.py
@@ -0,0 +1,62 @@
+from .framework import (
+    selenium_test,
+    SeleniumTestCase
+)
+
+
+class ChangePasswordTestCase(SeleniumTestCase):
+    @selenium_test
+    def test_change_password(self):
+        self.home()
+        email = self._get_random_email()
+        self.register(email)
+        self.click_masthead_user()
+        self.components.masthead.preferences.wait_for_and_click()
+        self.components.preferences.change_password.wait_for_and_click()
+        self.fill_input_fields(self.default_password, "123123", "123123")
+        self.logout_if_needed()
+        self.submit_login(email, "123123")
+
+    @selenium_test
+    def test_new_password_password(self):
+        self.register_and_change_password()
+        self.fill_input_fields(self.default_password, "", "123123")
+        self.assert_error_message(contains='Please provide a new password.')
+
+    @selenium_test
+    def test_no_password_confirmation(self):
+        self.register_and_change_password()
+        self.fill_input_fields(self.default_password, "123123", "5444484")
+        self.assert_error_message(contains='Passwords do not match.')
+
+    @selenium_test
+    def test_currect_password_incorrect(self):
+        self.register_and_change_password()
+        self.fill_input_fields("4444444", "123123", "123123")
+        self.assert_error_message(contains='Invalid current password.')
+
+    @selenium_test
+    def test_new_password_short(self):
+        self.register_and_change_password()
+        self.fill_input_fields(self.default_password, "123", "123")
+        self.assert_error_message(contains='Use a password of at least 6 characters.')
+
+    @selenium_test
+    def test_new_password_same_password(self):
+        self.register_and_change_password()
+        password = self.default_password
+        self.fill_input_fields(password, password, password)
+
+    def register_and_change_password(self):
+        self.home()
+        self.register()
+        self.click_masthead_user()
+        self.components.masthead.preferences.wait_for_and_click()
+        self.components.preferences.change_password.wait_for_and_click()
+
+    def fill_input_fields(self, current, password, confirm):
+        self.sleep_for(self.wait_types.UX_TRANSITION)
+        self.driver.find_element_by_css_selector("[tour_id='current'] input").send_keys(current)
+        self.driver.find_element_by_css_selector("[tour_id='password'] input").send_keys(password)
+        self.driver.find_element_by_css_selector("[tour_id='confirm'] input").send_keys(confirm)
+        self.components.change_user_password.submit.wait_for_and_click()