diff --git a/src/app/base/components/ActionForm/ActionForm.test.tsx b/src/app/base/components/ActionForm/ActionForm.test.tsx
index 6b8656f228..c817442b0b 100644
--- a/src/app/base/components/ActionForm/ActionForm.test.tsx
+++ b/src/app/base/components/ActionForm/ActionForm.test.tsx
@@ -1,41 +1,21 @@
-import { Provider } from "react-redux";
-import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom-v5-compat";
-import configureStore from "redux-mock-store";
-
+import type { ActionFormProps } from "./ActionForm";
 import ActionForm, { Labels } from "./ActionForm";
 
 import { TestIds } from "app/base/components/FormikFormButtons";
-import type { RootState } from "app/store/root/types";
-import { rootState as rootStateFactory } from "testing/factories";
-import { userEvent, render, screen } from "testing/utils";
-
-let state: RootState;
-const mockStore = configureStore();
+import { userEvent, screen, renderWithBrowserRouter } from "testing/utils";
 
 describe("ActionForm", () => {
-  beforeEach(() => {
-    state = rootStateFactory();
-  });
-
   it("shows a spinner if form has not fully loaded", () => {
-    const store = mockStore(state);
-    render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <CompatRouter>
-            <ActionForm
-              actionName="action"
-              initialValues={{}}
-              loaded={false}
-              modelName="machine"
-              onSubmit={jest.fn()}
-              processingCount={0}
-              selectedCount={1}
-            />
-          </CompatRouter>
-        </MemoryRouter>
-      </Provider>
+    renderWithBrowserRouter(
+      <ActionForm
+        actionName="action"
+        initialValues={{}}
+        loaded={false}
+        modelName="machine"
+        onSubmit={jest.fn()}
+        processingCount={0}
+        selectedCount={1}
+      />
     );
 
     expect(
@@ -44,22 +24,15 @@ describe("ActionForm", () => {
   });
 
   it("can show the default submit label", () => {
-    const store = mockStore(state);
-    render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <CompatRouter>
-            <ActionForm
-              actionName="action"
-              initialValues={{}}
-              modelName="machine"
-              onSubmit={jest.fn()}
-              processingCount={0}
-              selectedCount={1}
-            />
-          </CompatRouter>
-        </MemoryRouter>
-      </Provider>
+    renderWithBrowserRouter(
+      <ActionForm
+        actionName="action"
+        initialValues={{}}
+        modelName="machine"
+        onSubmit={jest.fn()}
+        processingCount={0}
+        selectedCount={1}
+      />
     );
 
     expect(
@@ -68,23 +41,16 @@ describe("ActionForm", () => {
   });
 
   it("can override the submit label", () => {
-    const store = mockStore(state);
-    render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <CompatRouter>
-            <ActionForm
-              actionName="action"
-              initialValues={{}}
-              modelName="machine"
-              onSubmit={jest.fn()}
-              processingCount={0}
-              selectedCount={1}
-              submitLabel="Special save"
-            />
-          </CompatRouter>
-        </MemoryRouter>
-      </Provider>
+    renderWithBrowserRouter(
+      <ActionForm
+        actionName="action"
+        initialValues={{}}
+        modelName="machine"
+        onSubmit={jest.fn()}
+        processingCount={0}
+        selectedCount={1}
+        submitLabel="Special save"
+      />
     );
 
     expect(
@@ -93,22 +59,15 @@ describe("ActionForm", () => {
   });
 
   it("can show the correct saving state", async () => {
-    const store = mockStore(state);
-    render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <CompatRouter>
-            <ActionForm
-              actionName="action"
-              initialValues={{}}
-              modelName="machine"
-              onSubmit={jest.fn()}
-              processingCount={1}
-              selectedCount={2}
-            />
-          </CompatRouter>
-        </MemoryRouter>
-      </Provider>
+    renderWithBrowserRouter(
+      <ActionForm
+        actionName="action"
+        initialValues={{}}
+        modelName="machine"
+        onSubmit={jest.fn()}
+        processingCount={1}
+        selectedCount={2}
+      />
     );
 
     await userEvent.click(screen.getByRole("button"));
@@ -120,45 +79,31 @@ describe("ActionForm", () => {
   });
 
   it("disables the submit button when selectedCount equals 0", async () => {
-    const store = mockStore(state);
-    render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <CompatRouter>
-            <ActionForm
-              actionName="action"
-              initialValues={{}}
-              modelName="machine"
-              onSubmit={jest.fn()}
-              selectedCount={0}
-            />
-          </CompatRouter>
-        </MemoryRouter>
-      </Provider>
+    renderWithBrowserRouter(
+      <ActionForm
+        actionName="action"
+        initialValues={{}}
+        modelName="machine"
+        onSubmit={jest.fn()}
+        selectedCount={0}
+      />
     );
 
     expect(screen.getByRole("button")).toBeDisabled();
   });
 
   it("shows correct saving label if selectedCount changes after submit", async () => {
-    const store = mockStore(state);
-    const Proxy = ({ selectedCount }: { selectedCount: number }) => (
-      <Provider store={store}>
-        <MemoryRouter>
-          <CompatRouter>
-            <ActionForm
-              actionName="action"
-              initialValues={{}}
-              modelName="machine"
-              onSubmit={jest.fn()}
-              processingCount={2}
-              selectedCount={selectedCount}
-            />
-          </CompatRouter>
-        </MemoryRouter>
-      </Provider>
+    const Proxy = ({ selectedCount }: Partial<ActionFormProps<{}>>) => (
+      <ActionForm
+        actionName="action"
+        initialValues={{}}
+        modelName="machine"
+        onSubmit={jest.fn()}
+        processingCount={2}
+        selectedCount={selectedCount}
+      />
     );
-    const { rerender } = render(<Proxy selectedCount={2} />);
+    const { rerender } = renderWithBrowserRouter(<Proxy selectedCount={2} />);
 
     // Submit the form to start processing.
     await userEvent.click(screen.getByRole("button"));
@@ -175,27 +120,65 @@ describe("ActionForm", () => {
   });
 
   it("can override showing the processing count", async () => {
-    const store = mockStore(state);
-    render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <CompatRouter>
-            <ActionForm
-              actionName="action"
-              initialValues={{}}
-              modelName="machine"
-              onSubmit={jest.fn()}
-              processingCount={1}
-              selectedCount={2}
-              showProcessingCount={false}
-            />
-          </CompatRouter>
-        </MemoryRouter>
-      </Provider>
+    renderWithBrowserRouter(
+      <ActionForm
+        actionName="action"
+        initialValues={{}}
+        modelName="machine"
+        onSubmit={jest.fn()}
+        processingCount={1}
+        selectedCount={2}
+        showProcessingCount={false}
+      />
     );
 
     await userEvent.click(screen.getByRole("button"));
 
     expect(screen.queryByTestId(TestIds.SavingLabel)).not.toBeInTheDocument();
   });
+
+  it("displays a correct action status", () => {
+    const Proxy = ({ actionStatus, errors }: Partial<ActionFormProps<{}>>) => (
+      <ActionForm
+        actionName="action"
+        actionStatus={actionStatus}
+        errors={errors}
+        initialValues={{}}
+        modelName="machine"
+        onSubmit={jest.fn()}
+      />
+    );
+
+    const { rerender } = renderWithBrowserRouter(
+      <Proxy actionStatus="loading" />
+    );
+    expect(screen.getByTestId(TestIds.SavingLabel)).toBeInTheDocument();
+
+    rerender(<Proxy actionStatus="success" />);
+    expect(screen.queryByTestId(TestIds.SavingLabel)).not.toBeInTheDocument();
+
+    const errors = { field: "Error message" };
+    rerender(<Proxy errors={errors} />);
+    expect(screen.getByText("Error message")).toBeInTheDocument();
+  });
+
+  it("sets saved status when processingCount drops to 0", () => {
+    const onSubmit = jest.fn();
+    const Proxy = ({ processingCount }: Partial<ActionFormProps<{}>>) => (
+      <ActionForm
+        actionName="action"
+        actionStatus="idle"
+        initialValues={{}}
+        modelName="machine"
+        onSubmit={onSubmit}
+        processingCount={processingCount}
+      />
+    );
+
+    const { rerender } = renderWithBrowserRouter(<Proxy processingCount={1} />);
+    expect(screen.getByTestId(TestIds.SavingLabel)).toBeInTheDocument();
+
+    rerender(<Proxy processingCount={0} />);
+    expect(screen.queryByTestId(TestIds.SavingLabel)).not.toBeInTheDocument();
+  });
 });
diff --git a/src/app/base/components/ActionForm/ActionForm.tsx b/src/app/base/components/ActionForm/ActionForm.tsx
index 7705e98013..5cada0709b 100644
--- a/src/app/base/components/ActionForm/ActionForm.tsx
+++ b/src/app/base/components/ActionForm/ActionForm.tsx
@@ -31,7 +31,7 @@ const getLabel = (
   return getNodeActionLabel(modelString, actionName, processing);
 };
 
-export type Props<V extends object, E = null> = Omit<
+export type ActionFormProps<V extends object, E = null> = Omit<
   FormikFormProps<V, E>,
   "buttonsAlign" | "saved" | "saving" | "savingLabel" | "submitLabel"
 > & {
@@ -65,7 +65,7 @@ const ActionForm = <V extends object, E = null>({
   submitLabel,
   actionStatus,
   ...formikFormProps
-}: Props<V, E>): JSX.Element | null => {
+}: ActionFormProps<V, E>): JSX.Element | null => {
   const [selectedOnSubmit, setSelectedOnSubmit] = useState(selectedCount);
   const processingComplete = useProcessing({
     hasErrors: !!errors,
@@ -80,18 +80,13 @@ const ActionForm = <V extends object, E = null>({
     );
   }
   // TODO: remove processingComplete once actionStatus has been implemented across all forms
-  // github.com/canonical/app-tribe/issues/1289
-  const statusProps = actionStatus
-    ? {
-        saving: actionStatus === "loading",
-        saved: actionStatus === "success",
-        errors: errors || actionErrors,
-      }
-    : {
-        saved: processingComplete,
-        saving: !!processingCount && processingCount > 0,
-        errors: errors || actionErrors,
-      };
+  // https://warthogs.atlassian.net/browse/MAASENG-2312
+  const statusProps = {
+    saving:
+      actionStatus === "loading" || (!!processingCount && processingCount > 0),
+    saved: actionStatus === "success" || processingComplete,
+    errors: errors || actionErrors,
+  };
 
   return (
     <FormikForm<V, E>
diff --git a/src/app/base/components/ActionForm/index.ts b/src/app/base/components/ActionForm/index.ts
index 11a00502c4..0c2f321b89 100644
--- a/src/app/base/components/ActionForm/index.ts
+++ b/src/app/base/components/ActionForm/index.ts
@@ -1,2 +1,2 @@
 export { default } from "./ActionForm";
-export type { Props } from "./ActionForm";
+export type { ActionFormProps } from "./ActionForm";