diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index b701285c186..d6410e03dde 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -906,6 +906,10 @@ tour:
       next: '${_} .tour-next'
       end: '${_} .tour-end'
 
+tools:
+  selectors:
+    activity: "#activity-tools"
+
 admin:
   allowlist:
     selectors:
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 2ee3e575f02..c4e9ba6d7eb 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -1268,6 +1268,10 @@ class NavigatesGalaxy(HasDriver):
         self.components.histories.activity.wait_for_and_click()
         self.components.published_histories.tab.wait_for_and_click()
 
+    def navigate_to_tools(self):
+        self.home()
+        self.components.tools.activity.wait_for_and_click()
+
     def admin_open(self):
         self.components.admin.activity.wait_for_and_click()
 
diff --git a/lib/galaxy_test/selenium/test_change_password.py b/lib/galaxy_test/selenium/test_change_password.py
index 7b8aae51050..8ab3e9f8e31 100644
--- a/lib/galaxy_test/selenium/test_change_password.py
+++ b/lib/galaxy_test/selenium/test_change_password.py
@@ -10,8 +10,7 @@ class TestChangePassword(SeleniumTestCase):
         self.home()
         email = self._get_random_email()
         self.register(email)
-        self.click_masthead_user()
-        self.components.masthead.preferences.wait_for_and_click()
+        self.navigate_to_user_preferences()
         self.components.preferences.change_password.wait_for_and_click()
         new_password = self._get_random_password()
         self.fill_input_fields(self.default_password, new_password, new_password)
@@ -57,8 +56,7 @@ class TestChangePassword(SeleniumTestCase):
     def register_and_change_password(self):
         self.home()
         self.register()
-        self.click_masthead_user()
-        self.components.masthead.preferences.wait_for_and_click()
+        self.navigate_to_user_preferences()
         self.components.preferences.change_password.wait_for_and_click()
 
     def fill_input_fields(self, current, password, confirm):
diff --git a/lib/galaxy_test/selenium/test_sign_out.py b/lib/galaxy_test/selenium/test_sign_out.py
index 2b3a715b386..c08ed95761d 100644
--- a/lib/galaxy_test/selenium/test_sign_out.py
+++ b/lib/galaxy_test/selenium/test_sign_out.py
@@ -11,8 +11,7 @@ class TestSignOut(SeleniumTestCase):
     def test_sign_out(self):
         email = self._get_random_email()
         self.register(email)
-        self.click_masthead_user()
-        self.components.masthead.preferences.wait_for_and_click()
+        self.navigate_to_user_preferences()
         self.components.preferences.sign_out.wait_for_and_click()
         self.components.sign_out.cancel_button.wait_for_and_click()
         assert self.is_logged_in()
diff --git a/test/integration_selenium/test_objectstore_selection.py b/test/integration_selenium/test_objectstore_selection.py
index 85be2f93743..e0585bea6de 100644
--- a/test/integration_selenium/test_objectstore_selection.py
+++ b/test/integration_selenium/test_objectstore_selection.py
@@ -118,6 +118,7 @@ class TestObjectStoreSelectionSeleniumIntegration(SeleniumIntegrationTestCase, C
         preferences = self.components.preferences
         preferences.preferred_storage.wait_for_and_click()
         self.select_storage("second")
+        self.navigate_to_tools()
         self.run_environment_test_tool()
         self.wait_for_hid_ok_and_open_details(1)
         details = self.components.object_store_details
@@ -136,7 +137,7 @@ class TestObjectStoreSelectionSeleniumIntegration(SeleniumIntegrationTestCase, C
         preferences = self.components.preferences
         preferences.preferred_storage.wait_for_and_click()
         self.select_storage("__null__")
-
+        self.navigate_to_tools()
         self.run_environment_test_tool()
         self.wait_for_hid_ok_and_open_details(1)
         details = self.components.object_store_details
diff --git a/test/integration_selenium/test_user_file_source_aws_public.py b/test/integration_selenium/test_user_file_source_aws_public.py
index 668d022b97f..5ec2ba12d64 100644
--- a/test/integration_selenium/test_user_file_source_aws_public.py
+++ b/test/integration_selenium/test_user_file_source_aws_public.py
@@ -15,7 +15,6 @@ class TestUserFileSourceAwsPublicSeleniumIntegration(BaseUserObjectStoreSelenium
     @managed_history
     @selenium_test
     def test_create_and_use(self):
-        self.navigate_to_user_preferences()
         random_name = self._get_random_name(prefix="Encyclopedia of DNA Elements ENCODE")
         instance = FileSourceInstance(
             template_id="aws_public",