diff --git a/client/src/components/Common/FilterMenu.test.ts b/client/src/components/Common/FilterMenu.test.ts
index bab978663fcb..b9ba3db65b3b 100644
--- a/client/src/components/Common/FilterMenu.test.ts
+++ b/client/src/components/Common/FilterMenu.test.ts
@@ -3,11 +3,14 @@ import { getLocalVue } from "@tests/jest/helpers";
 import { mount, type Wrapper } from "@vue/test-utils";
 
 import { HistoryFilters } from "@/components/History/HistoryFilters";
+import { setupSelectableMock } from "@/components/ObjectStore/mockServices";
 import { WorkflowFilters } from "@/components/Workflow/List/WorkflowFilters";
 import Filtering, { compare, contains, equals, toBool, toDate } from "@/utils/filtering";
 
 import FilterMenu from "./FilterMenu.vue";
 
+setupSelectableMock();
+
 const localVue = getLocalVue();
 const options = [
     { text: "Any", value: "any" },
diff --git a/client/src/components/Form/Elements/FormDirectory.test.js b/client/src/components/Form/Elements/FormDirectory.test.js
index 1504e1133d2a..3aef7b6b052c 100644
--- a/client/src/components/Form/Elements/FormDirectory.test.js
+++ b/client/src/components/Form/Elements/FormDirectory.test.js
@@ -2,6 +2,7 @@ import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { createPinia } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
+import { setupMockConfig } from "tests/jest/mockConfig";
 
 import { useServerMock } from "@/api/client/__mocks__";
 import { rootResponse } from "@/components/FilesDialog/testingData";
@@ -13,6 +14,7 @@ const localVue = getLocalVue();
 jest.mock("app");
 
 const { server, http } = useServerMock();
+setupMockConfig({});
 
 describe("DirectoryPathEditableBreadcrumb", () => {
     let wrapper;
@@ -56,10 +58,6 @@ describe("DirectoryPathEditableBreadcrumb", () => {
         server.use(
             http.get("/api/remote_files/plugins", ({ response }) => {
                 return response(200).json(rootResponse);
-            }),
-
-            http.get("/api/configuration", ({ response }) => {
-                return response(200).json({});
             })
         );
 
diff --git a/client/src/components/Grid/GridList.test.js b/client/src/components/Grid/GridList.test.js
index 3abe0006a669..2639156b6bac 100644
--- a/client/src/components/Grid/GridList.test.js
+++ b/client/src/components/Grid/GridList.test.js
@@ -11,8 +11,6 @@ import MountTarget from "./GridList.vue";
 
 jest.useFakeTimers();
 
-jest.mock("composables/config");
-
 setupMockConfig({ disabled: false, enabled: true });
 
 jest.mock("vue-router/composables");
diff --git a/client/src/components/HistoryImport.test.js b/client/src/components/HistoryImport.test.js
index 120a0c07306e..3265f2737c2f 100644
--- a/client/src/components/HistoryImport.test.js
+++ b/client/src/components/HistoryImport.test.js
@@ -1,6 +1,7 @@
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { getLocalVue, wait } from "tests/jest/helpers";
+import VueRouter from "vue-router";
 
 import { useServerMock } from "@/api/client/__mocks__";
 import { waitOnJob } from "@/components/JobStates/wait";
@@ -8,6 +9,9 @@ import { waitOnJob } from "@/components/JobStates/wait";
 import HistoryImport from "./HistoryImport.vue";
 
 const localVue = getLocalVue();
+localVue.use(VueRouter);
+const router = new VueRouter();
+
 const TEST_JOB_ID = "job123789";
 const TEST_SOURCE_URL = "http://galaxy.example/import";
 
@@ -43,6 +47,7 @@ describe("HistoryImport.vue", () => {
         wrapper = mount(HistoryImport, {
             propsData: {},
             localVue,
+            router,
         });
         await flushPromises();
     });
diff --git a/client/src/components/JobInformation/JobOutputs.vue b/client/src/components/JobInformation/JobOutputs.vue
index 841e08f67761..494690707c07 100644
--- a/client/src/components/JobInformation/JobOutputs.vue
+++ b/client/src/components/JobInformation/JobOutputs.vue
@@ -26,9 +26,9 @@
                 </tr>
                 <tr v-if="paginate && totalLength > firstN">
                     <td colspan="2">
-                        <b-button id="paginate-btn" block variant="secondary" @click="firstN += 10">
+                        <BButton id="paginate-btn" block variant="secondary" @click="firstN += 10">
                             Show {{ totalLength - firstN >= 10 ? 10 : totalLength - firstN }} more outputs
-                        </b-button>
+                        </BButton>
                     </td>
                 </tr>
             </tbody>
@@ -37,10 +37,12 @@
 </template>
 
 <script>
+import { BButton } from "bootstrap-vue";
 import GenericHistoryItem from "components/History/Content/GenericItem";
 
 export default {
     components: {
+        BButton,
         GenericHistoryItem,
     },
     props: {
diff --git a/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.test.js b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.test.js
index a9cd95acdbc8..e9361922eb43 100644
--- a/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.test.js
+++ b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.test.js
@@ -1,10 +1,13 @@
 import { mount } from "@vue/test-utils";
 import { getLocalVue } from "tests/jest/helpers";
+import VueRouter from "vue-router";
 
 import { worldwideCarbonIntensity, worldwidePowerUsageEffectiveness } from "./carbonEmissionConstants.js";
 import CarbonEmissions from "./CarbonEmissions";
 
 const localVue = getLocalVue();
+localVue.use(VueRouter);
+const router = new VueRouter();
 
 const oneGibibyteMemoryInMebibyte = 1024;
 const oneHourInSeconds = 3600;
@@ -27,8 +30,10 @@ describe("CarbonEmissions/CarbonEmissions.vue", () => {
                 jobRuntimeInSeconds: oneHourInSeconds,
                 memoryAllocatedInMebibyte: oneGibibyteMemoryInMebibyte,
                 powerUsageEffectiveness: worldwidePowerUsageEffectiveness,
+                geographicalServerLocationName: "GLOBAL",
             },
             localVue,
+            router,
         });
 
         const cpuEmissions = wrapper.find("#cpu-carbon-emissions").text();
@@ -48,8 +53,12 @@ describe("CarbonEmissions/CarbonEmissions.vue", () => {
                 coresAllocated: 1,
                 estimatedServerInstance: testServerInstance,
                 jobRuntimeInSeconds: 1,
+                geographicalServerLocationName: "GLOBAL",
+                powerUsageEffectiveness: worldwidePowerUsageEffectiveness,
+                carbonIntensity: worldwideCarbonIntensity,
             },
             localVue,
+            router,
         });
 
         expect(wrapper.find("#memory-carbon-emissions").exists()).toBe(false);
@@ -65,8 +74,10 @@ describe("CarbonEmissions/CarbonEmissions.vue", () => {
                 jobRuntimeInSeconds: 1,
                 memoryAllocatedInMebibyte: 1,
                 powerUsageEffectiveness: 0,
+                geographicalServerLocationName: "GLOBAL",
             },
             localVue,
+            router,
         });
 
         const cpuEmissions = wrapper.find("#cpu-carbon-emissions").text();
@@ -89,8 +100,10 @@ describe("CarbonEmissions/CarbonEmissions.vue", () => {
                 jobRuntimeInSeconds: 1,
                 memoryAllocatedInMebibyte: 1,
                 powerUsageEffectiveness: 1,
+                geographicalServerLocationName: "GLOBAL",
             },
             localVue,
+            router,
         });
 
         const cpuEmissions = wrapper.find("#cpu-carbon-emissions").text();
@@ -109,8 +122,10 @@ describe("CarbonEmissions/CarbonEmissions.vue", () => {
                 estimatedServerInstance: testServerInstance,
                 jobRuntimeInSeconds: 2,
                 geographicalServerLocationName: "GLOBAL",
+                powerUsageEffectiveness: worldwidePowerUsageEffectiveness,
             },
             localVue,
+            router,
         });
         const locationText = wrapper.find("#location-explanation").element;
         expect(locationText).toHaveTextContent(
@@ -132,6 +147,7 @@ describe("CarbonEmissions/CarbonEmissions.vue", () => {
                 geographicalServerLocationName: locationName,
             },
             localVue,
+            router,
         });
 
         const locationElement = wrapper.find("#location-explanation").element;
@@ -150,8 +166,10 @@ describe("CarbonEmissions/CarbonEmissions.vue", () => {
                 jobRuntimeInSeconds: 1,
                 memoryAllocatedInMebibyte: 1,
                 powerUsageEffectiveness,
+                geographicalServerLocationName: "GLOBAL",
             },
             localVue,
+            router,
         });
 
         const locationElement = wrapper.find("#pue").element;
diff --git a/client/src/components/Login/LoginForm.test.ts b/client/src/components/Login/LoginForm.test.ts
index 9422c8af8f88..33a1b6360cf9 100644
--- a/client/src/components/Login/LoginForm.test.ts
+++ b/client/src/components/Login/LoginForm.test.ts
@@ -1,11 +1,19 @@
+import { createTestingPinia } from "@pinia/testing";
 import { getLocalVue } from "@tests/jest/helpers";
 import { mount } from "@vue/test-utils";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
+import flushPromises from "flush-promises";
+
+import { useServerMock } from "@/api/client/__mocks__";
+import { HttpResponse } from "@/api/client/__mocks__/index";
 
 import MountTarget from "./LoginForm.vue";
 
 const localVue = getLocalVue(true);
+const testingPinia = createTestingPinia({ stubActions: false });
+
+const { server, http } = useServerMock();
 
 async function mountLoginForm() {
     const wrapper = mount(MountTarget as object, {
@@ -16,6 +24,7 @@ async function mountLoginForm() {
         stubs: {
             ExternalLogin: true,
         },
+        pinia: testingPinia,
     });
 
     return wrapper;
@@ -26,6 +35,11 @@ describe("LoginForm", () => {
 
     beforeEach(() => {
         axiosMock = new MockAdapter(axios);
+        server.use(
+            http.get("/api/configuration", ({ response }) => {
+                return response.untyped(HttpResponse.json({ oidc: { cilogon: false, custos: false } }));
+            })
+        );
     });
 
     afterEach(() => {
@@ -62,8 +76,6 @@ describe("LoginForm", () => {
     it("props", async () => {
         const wrapper = await mountLoginForm();
 
-        console.log(wrapper.html());
-
         const $register = "#register-toggle";
         expect(wrapper.findAll($register).length).toBe(0);
 
@@ -79,6 +91,7 @@ describe("LoginForm", () => {
 
         const welcomePage = wrapper.find("iframe");
         expect(welcomePage.attributes("src")).toBe("welcome_url");
+        await flushPromises();
     });
 
     it("connect external provider", async () => {
@@ -126,5 +139,6 @@ describe("LoginForm", () => {
 
         const postedURL = axiosMock.history.post?.[0]?.url;
         expect(postedURL).toBe("/user/login");
+        await flushPromises();
     });
 });
diff --git a/client/src/components/Masthead/Masthead.test.js b/client/src/components/Masthead/Masthead.test.js
index b45b9f60bbf4..bb42d0026b1d 100644
--- a/client/src/components/Masthead/Masthead.test.js
+++ b/client/src/components/Masthead/Masthead.test.js
@@ -5,8 +5,8 @@ import flushPromises from "flush-promises";
 import { WindowManager } from "layout/window-manager";
 import { PiniaVuePlugin } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
+import { setupMockConfig } from "tests/jest/mockConfig";
 
-import { useServerMock } from "@/api/client/__mocks__";
 import { useUserStore } from "@/stores/userStore";
 
 import { loadWebhookMenuItems } from "./_webhooks";
@@ -20,10 +20,10 @@ jest.mock("vue-router/composables", () => ({
     useRouter: jest.fn(),
 }));
 
-const { server, http } = useServerMock();
-
 const currentUser = getFakeRegisteredUser();
 
+setupMockConfig({});
+
 describe("Masthead.vue", () => {
     let wrapper;
     let localVue;
@@ -45,12 +45,6 @@ describe("Masthead.vue", () => {
         localVue.use(PiniaVuePlugin);
         testPinia = createTestingPinia();
 
-        server.use(
-            http.get("/api/configuration", ({ response }) => {
-                return response(200).json({});
-            })
-        );
-
         windowManager = new WindowManager({});
         const windowTab = windowManager.getTab();
 
@@ -63,6 +57,9 @@ describe("Masthead.vue", () => {
             },
             localVue,
             pinia: testPinia,
+            stubs: {
+                Icon: true,
+            },
         });
         await flushPromises();
     });
diff --git a/client/src/components/ObjectStore/Instances/CreateForm.test.ts b/client/src/components/ObjectStore/Instances/CreateForm.test.ts
index 1012bb09858c..5fc871116ecb 100644
--- a/client/src/components/ObjectStore/Instances/CreateForm.test.ts
+++ b/client/src/components/ObjectStore/Instances/CreateForm.test.ts
@@ -154,7 +154,6 @@ describe("CreateForm", () => {
         const emitted = wrapper.emitted("created") || [];
         expect(emitted).toHaveLength(0);
         const errorEl = wrapper.find("[data-description='object-store-creation-error']");
-        console.log(wrapper.html());
         expect(errorEl.exists()).toBe(true);
         expect(errorEl.html()).toContain("Error creating this");
     });
diff --git a/client/src/components/Panels/Buttons/FavoritesButton.test.js b/client/src/components/Panels/Buttons/FavoritesButton.test.js
index 6b4130f38928..2fb0b4690275 100644
--- a/client/src/components/Panels/Buttons/FavoritesButton.test.js
+++ b/client/src/components/Panels/Buttons/FavoritesButton.test.js
@@ -10,6 +10,9 @@ const localVue = getLocalVue();
 async function createWrapper(component, localVue, userData) {
     const pinia = createPinia();
     const wrapper = shallowMount(component, {
+        propsData: {
+            query: "mock",
+        },
         localVue,
         pinia,
     });
diff --git a/client/src/components/Tool/ToolForm.test.js b/client/src/components/Tool/ToolForm.test.js
index ddb9f850d2bf..61ae74603af3 100644
--- a/client/src/components/Tool/ToolForm.test.js
+++ b/client/src/components/Tool/ToolForm.test.js
@@ -1,10 +1,12 @@
+import "tests/jest/mockHelpPopovers";
+
 import { getFakeRegisteredUser } from "@tests/test-data";
 import { mount } from "@vue/test-utils";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import flushPromises from "flush-promises";
 import { createPinia } from "pinia";
-import { getLocalVue } from "tests/jest/helpers";
+import { getLocalVue, suppressBootstrapVueWarnings } from "tests/jest/helpers";
 
 import { HttpResponse, useServerMock } from "@/api/client/__mocks__";
 import MockCurrentHistory from "@/components/providers/MockCurrentHistory";
@@ -18,6 +20,11 @@ const { server, http } = useServerMock();
 const localVue = getLocalVue();
 const pinia = createPinia();
 
+// the PersonViewer component uses a BPopover that doesn't work with jsdom properly. It would be
+// better to break PersonViewer and OrganizationViewer out into smaller subcomponents and just
+// stub out the Popover piece I think.
+suppressBootstrapVueWarnings();
+
 describe("ToolForm", () => {
     let wrapper;
     let axiosMock;
@@ -25,6 +32,8 @@ describe("ToolForm", () => {
     let historyStore;
 
     beforeEach(() => {
+        // I tried using the useConfig mock and this component seems to bypass that, it would be
+        // better if it didn't. We shouldn't have to stub out an API request to get a particular config.
         server.use(
             http.get("/api/configuration", ({ response }) => {
                 return response.untyped(
@@ -43,6 +52,7 @@ describe("ToolForm", () => {
             version: "version",
             inputs: [],
             help: "help_text",
+            help_format: "restructuredtext",
             creator: [{ class: "Person", givenName: "FakeName", familyName: "FakeSurname", email: "fakeEmail" }],
         });
         axiosMock.onGet(`/api/webhooks`).reply(200, []);
diff --git a/client/src/components/Upload/DefaultBox.test.js b/client/src/components/Upload/DefaultBox.test.js
index cdf918838b41..6aa9bb63de6a 100644
--- a/client/src/components/Upload/DefaultBox.test.js
+++ b/client/src/components/Upload/DefaultBox.test.js
@@ -1,4 +1,5 @@
 import { mount } from "@vue/test-utils";
+import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
 
 import mountTarget from "./DefaultBox.vue";
@@ -26,6 +27,30 @@ function getWrapper() {
 }
 
 describe("Default", () => {
+    let UnpatchedIntersectionObserver;
+
+    beforeEach(() => {
+        UnpatchedIntersectionObserver = global.IntersectionObserver;
+
+        // The use of b-textarea in this DefaultRow causes the following warning:
+        // [Vue warn]: Error in directive b-visible unbind hook: "TypeError: this.observer.disconnect is not a function"
+        // I don't think there is a problem with the usage so I think this a bug in bootstrap vue, it can be worked around
+        // with the following code - but just suppressing the warning is probably better?
+        const observerMock = jest.fn(function IntersectionObserver(callback) {
+            this.observe = jest.fn();
+            this.disconnect = jest.fn();
+            // Optionally add a trigger() method to manually trigger a change
+            this.trigger = (mockedMutationsList) => {
+                callback(mockedMutationsList, this);
+            };
+        });
+        global.IntersectionObserver = observerMock;
+    });
+
+    afterEach(() => {
+        global.IntersectionObserver = UnpatchedIntersectionObserver;
+    });
+
     it("rendering", async () => {
         const wrapper = getWrapper();
         expect(wrapper.vm.counterAnnounce).toBe(0);
@@ -34,6 +59,7 @@ describe("Default", () => {
         expect(wrapper.find("#btn-reset").classes()).toEqual(expect.arrayContaining(["disabled"]));
         expect(wrapper.find("#btn-start").classes()).toEqual(expect.arrayContaining(["disabled"]));
         expect(wrapper.find("#btn-stop").classes()).toEqual(expect.arrayContaining(["disabled"]));
+        await flushPromises();
     });
 
     it("resets properly", async () => {
@@ -44,6 +70,7 @@ describe("Default", () => {
         expect(wrapper.vm.counterAnnounce).toBe(1);
         await wrapper.find("#btn-reset").trigger("click");
         expect(wrapper.vm.showHelper).toBe(true);
+        await flushPromises();
     });
 
     it("does render remote files button", async () => {
@@ -51,6 +78,7 @@ describe("Default", () => {
         expect(wrapper.find("#btn-remote-files").exists()).toBeTruthy();
         await wrapper.setProps({ fileSourcesConfigured: false });
         expect(wrapper.find("#btn-remote-files").exists()).toBeFalsy();
+        await flushPromises();
     });
 
     it("renders a limited set", async () => {
@@ -61,5 +89,6 @@ describe("Default", () => {
         expect(wrapper.findAll(".upload-row").length).toBe(3);
         const textMessage = wrapper.find("[data-description='lazyload message']");
         expect(textMessage.text()).toBe("Only showing first 3 of 5 entries.");
+        await flushPromises();
     });
 });
diff --git a/client/src/components/Upload/UploadModal.test.js b/client/src/components/Upload/UploadModal.test.js
index aa3a5e47caea..b69b34c0ef87 100644
--- a/client/src/components/Upload/UploadModal.test.js
+++ b/client/src/components/Upload/UploadModal.test.js
@@ -1,3 +1,5 @@
+import "tests/jest/mockHelpPopovers";
+
 import { mount } from "@vue/test-utils";
 import { createPinia } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
diff --git a/client/src/components/User/UserPreferredObjectStore.test.js b/client/src/components/User/UserPreferredObjectStore.test.js
index 325617b84b4d..87a16141ddf4 100644
--- a/client/src/components/User/UserPreferredObjectStore.test.js
+++ b/client/src/components/User/UserPreferredObjectStore.test.js
@@ -1,3 +1,5 @@
+import "tests/jest/mockHelpPopovers";
+
 import { getFakeRegisteredUser } from "@tests/test-data";
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
diff --git a/client/src/components/Workflow/Editor/Attributes.test.js b/client/src/components/Workflow/Editor/Attributes.test.js
index f195e4622725..b1b4e2cd5a4a 100644
--- a/client/src/components/Workflow/Editor/Attributes.test.js
+++ b/client/src/components/Workflow/Editor/Attributes.test.js
@@ -1,6 +1,5 @@
 import { createLocalVue, mount } from "@vue/test-utils";
 import { isDate } from "date-fns";
-import { computed } from "vue";
 
 import { useUserTagsStore } from "@/stores/userTagsStore";
 
@@ -19,7 +18,7 @@ const autocompleteTags = ["#named_uer_tag", "abc", "my_tag"];
 
 jest.mock("@/stores/userTagsStore");
 useUserTagsStore.mockReturnValue({
-    userTags: computed(() => autocompleteTags),
+    userTags: autocompleteTags,
     onNewTagSeen: jest.fn(),
     onTagUsed: jest.fn(),
     onMultipleNewTagsSeen: jest.fn(),
diff --git a/client/src/components/Workflow/List/WorkflowList.test.ts b/client/src/components/Workflow/List/WorkflowList.test.ts
index 4d82fcf08c4f..b1851fea8740 100644
--- a/client/src/components/Workflow/List/WorkflowList.test.ts
+++ b/client/src/components/Workflow/List/WorkflowList.test.ts
@@ -1,9 +1,10 @@
 import { createTestingPinia } from "@pinia/testing";
-import { getLocalVue } from "@tests/jest/helpers";
+import { getLocalVue, suppressBootstrapVueWarnings } from "@tests/jest/helpers";
 import { getFakeRegisteredUser } from "@tests/test-data";
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { setActivePinia } from "pinia";
+import VueRouter from "vue-router";
 
 import { HttpResponse, useServerMock } from "@/api/client/__mocks__";
 import { useUserStore } from "@/stores/userStore";
@@ -13,6 +14,8 @@ import { generateRandomWorkflowList } from "../testUtils";
 import WorkflowList from "./WorkflowList.vue";
 
 const localVue = getLocalVue();
+localVue.use(VueRouter);
+const router = new VueRouter();
 
 const { server, http } = useServerMock();
 
@@ -29,19 +32,10 @@ async function mountWorkflowList() {
     const pinia = createTestingPinia();
     setActivePinia(pinia);
 
-    const mockRouter = {
-        push: jest.fn(),
-        currentRoute: {
-            query: {},
-        },
-    };
-
     const wrapper = mount(WorkflowList as object, {
         localVue,
         pinia,
-        mocks: {
-            $router: mockRouter,
-        },
+        router,
     });
 
     const userStore = useUserStore();
@@ -52,6 +46,9 @@ async function mountWorkflowList() {
     return wrapper;
 }
 
+// The use of the tool tip in statelesstag without a real dom is causing issues
+suppressBootstrapVueWarnings();
+
 describe("WorkflowList", () => {
     beforeEach(() => {
         server.use(
@@ -122,5 +119,6 @@ describe("WorkflowList", () => {
         await wrapper.vm.$nextTick();
 
         expect((wrapper.find("#workflow-list-filter input").element as HTMLInputElement).value).toBe("");
+        await flushPromises();
     });
 });
diff --git a/client/src/components/Workflow/Run/WorkflowSelectPreferredObjectStore.test.js b/client/src/components/Workflow/Run/WorkflowSelectPreferredObjectStore.test.js
index c83456a58c3d..7cae96748199 100644
--- a/client/src/components/Workflow/Run/WorkflowSelectPreferredObjectStore.test.js
+++ b/client/src/components/Workflow/Run/WorkflowSelectPreferredObjectStore.test.js
@@ -1,26 +1,21 @@
+import "tests/jest/mockHelpPopovers";
+
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
+import { setupMockConfig } from "tests/jest/mockConfig";
 
-import { useServerMock } from "@/api/client/__mocks__";
 import { setupSelectableMock } from "@/components/ObjectStore/mockServices";
 import { ROOT_COMPONENT } from "@/utils/navigation";
 
 import WorkflowSelectPreferredObjectStore from "./WorkflowSelectPreferredObjectStore.vue";
 
 setupSelectableMock();
+setupMockConfig({});
 
 const localVue = getLocalVue(true);
 
-const { server, http } = useServerMock();
-
 function mountComponent() {
-    server.use(
-        http.get("/api/configuration", ({ response }) => {
-            return response(200).json({});
-        })
-    );
-
     const wrapper = mount(WorkflowSelectPreferredObjectStore, {
         propsData: { invocationPreferredObjectStoreId: null },
         localVue,
diff --git a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.test.js b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.test.js
index 876578e709c0..84037033515f 100644
--- a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.test.js
+++ b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.test.js
@@ -1,15 +1,35 @@
+import "tests/jest/mockHelpPopovers";
+
 import { createTestingPinia } from "@pinia/testing";
 import { mount } from "@vue/test-utils";
+import flushPromises from "flush-promises";
 import { findViaNavigation, getLocalVue } from "tests/jest/helpers";
 import { ROOT_COMPONENT } from "utils/navigation";
 
+import { useServerMock } from "@/api/client/__mocks__";
+
 import WorkflowStorageConfiguration from "./WorkflowStorageConfiguration";
 
 const localVue = getLocalVue(true);
 
+const { server, http } = useServerMock();
+
+jest.mock("@/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue", () => ({
+    name: "HelpPopover",
+    render: (h) => h("div", "Mocked Popover"),
+}));
+
 describe("WorkflowStorageConfiguration.vue", () => {
     let wrapper;
 
+    beforeEach(() => {
+        server.use(
+            http.get("/api/configuration", ({ response }) => {
+                return response(200).json({});
+            })
+        );
+    });
+
     async function doMount(split) {
         const propsData = {
             splitObjectStore: split,
@@ -33,6 +53,7 @@ describe("WorkflowStorageConfiguration.vue", () => {
                 ROOT_COMPONENT.workflow_run.intermediate_storage_indciator
             );
             expect(intermediateEl.exists()).toBeTruthy();
+            await flushPromises();
         });
 
         it("should show one button on not splitObjectStore", async () => {
@@ -44,6 +65,7 @@ describe("WorkflowStorageConfiguration.vue", () => {
                 ROOT_COMPONENT.workflow_run.intermediate_storage_indciator
             );
             expect(intermediateEl.exists()).toBeFalsy();
+            await flushPromises();
         });
     });
 
@@ -54,6 +76,7 @@ describe("WorkflowStorageConfiguration.vue", () => {
             const emitted = wrapper.emitted();
             expect(emitted["updated"][0][0]).toEqual("storage123");
             expect(emitted["updated"][0][1]).toEqual(false);
+            await flushPromises();
         });
 
         it("should fire an update event when intermediate selection is updated", async () => {
@@ -62,6 +85,7 @@ describe("WorkflowStorageConfiguration.vue", () => {
             const emitted = wrapper.emitted();
             expect(emitted["updated"][0][0]).toEqual("storage123");
             expect(emitted["updated"][0][1]).toEqual(true);
+            await flushPromises();
         });
     });
 });
diff --git a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
index 893ecc310dcd..faaf4e9c5c6a 100644
--- a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
+++ b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
@@ -49,7 +49,8 @@ import { mapState } from "pinia";
 import { useConfigStore } from "@/stores/configurationStore";
 
 import WorkflowSelectPreferredObjectStore from "./WorkflowSelectPreferredObjectStore";
-import WorkflowTargetPreferredObjectStorePopover from "./WorkflowTargetPreferredObjectStorePopover";
+
+import WorkflowTargetPreferredObjectStorePopover from "@/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue";
 
 export default {
     components: {