diff --git a/apps/website/screens/theme-generator/components/Tour/Tour.tsx b/apps/website/screens/theme-generator/components/Tour/Tour.tsx
index 3c17f3719..2c083491c 100644
--- a/apps/website/screens/theme-generator/components/Tour/Tour.tsx
+++ b/apps/website/screens/theme-generator/components/Tour/Tour.tsx
@@ -261,7 +261,7 @@ const Tour = ({ currentStep, onTourStepIndexChange }: TourProps) => {
               </DxcParagraph>
               <DxcFlex gap="var(--spacing-gap-s)" justifyContent="end" alignSelf="stretch">
                 <DxcButton
-                  label="Skip"
+                  label="Skip tour"
                   mode="tertiary"
                   size={{ height: "medium" }}
                   onClick={() => setDialogVisible(false)}
diff --git a/apps/website/test/theme-generator/Tour.test.tsx b/apps/website/test/theme-generator/Tour.test.tsx
new file mode 100644
index 000000000..e847b0e56
--- /dev/null
+++ b/apps/website/test/theme-generator/Tour.test.tsx
@@ -0,0 +1,296 @@
+import type { ComponentType, ReactNode } from "react";
+import { act, fireEvent, render, screen } from "@testing-library/react";
+import "@testing-library/jest-dom";
+import { useRouter } from "next/router";
+import Tour from "../../screens/theme-generator/components/Tour/Tour";
+import type { TourPopoverProps } from "../../screens/theme-generator/components/Tour/types";
+
+global.ResizeObserver = class ResizeObserver {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+};
+
+jest.mock("next/router", () => ({ useRouter: jest.fn() }));
+
+type MockEvent = { type?: string; action?: string; status?: string; index?: number };
+type MockTooltipProps = Omit<TourPopoverProps, "onFinish" | "onRestart">;
+type MockJoyrideProps = {
+  run: boolean;
+  stepIndex: number;
+  steps: { title?: string; content?: ReactNode; target: string }[];
+  onEvent: (event: MockEvent) => void;
+  tooltipComponent: ComponentType<MockTooltipProps>;
+};
+type JoyrideMockModule = { __state: { last: MockJoyrideProps | undefined } };
+
+jest.mock("react-joyride", () => {
+  const { createElement } = jest.requireActual<typeof import("react")>("react");
+  const joyrideState: { last: MockJoyrideProps | undefined } = { last: undefined };
+  const EVENTS = { STEP_AFTER: "step:after" };
+  const ACTIONS = { NEXT: "next", PREV: "prev", SKIP: "skip" };
+  const STATUS = { FINISHED: "finished", SKIPPED: "skipped", PAUSED: "paused", RUNNING: "running" };
+
+  return {
+    __state: joyrideState,
+    ACTIONS: { CLOSE: "close", ...ACTIONS },
+    EVENTS,
+    STATUS,
+    Joyride: (props: MockJoyrideProps) => {
+      joyrideState.last = props;
+      const step = props.steps[props.stepIndex];
+      if (!props.run || !step) {
+        return null;
+      }
+      const controls = {
+        next: () =>
+          props.onEvent({
+            type: EVENTS.STEP_AFTER,
+            action: ACTIONS.NEXT,
+            index: props.stepIndex,
+            status: STATUS.RUNNING,
+          }),
+        prev: () =>
+          props.onEvent({
+            type: EVENTS.STEP_AFTER,
+            action: ACTIONS.PREV,
+            index: props.stepIndex,
+            status: STATUS.RUNNING,
+          }),
+        skip: () =>
+          props.onEvent({ type: "tour:end", action: ACTIONS.SKIP, index: props.stepIndex, status: STATUS.SKIPPED }),
+      };
+      return createElement(props.tooltipComponent, {
+        step,
+        index: props.stepIndex,
+        size: props.steps.length,
+        isLastStep: props.stepIndex === props.steps.length - 1,
+        controls,
+        tooltipProps: { "aria-modal": true, role: "dialog" },
+      });
+    },
+  };
+});
+
+const joyrideState = jest.requireMock<JoyrideMockModule>("react-joyride").__state;
+const currentProps = (): MockJoyrideProps => {
+  if (!joyrideState.last) {
+    throw new Error("Joyride has not rendered yet");
+  }
+  return joyrideState.last;
+};
+
+const mockUseRouter = useRouter as unknown as jest.Mock;
+const routerReplace = jest.fn();
+const onTourStepIndexChange = jest.fn();
+
+const SECTIONS = [
+  { section: 0, title: "The 3-Step Journey" },
+  { section: 1, title: "Preview theme" },
+  { section: 2, title: "Review theme" },
+] as const;
+
+const tourElement = (currentStep: number) => (
+  <Tour currentStep={currentStep} onTourStepIndexChange={onTourStepIndexChange} />
+);
+
+const renderTour = ({ currentStep = 0, welcome = false }: { currentStep?: number; welcome?: boolean } = {}) => {
+  mockUseRouter.mockReturnValue({ query: welcome ? { tour: "true" } : {}, replace: routerReplace });
+  return render(tourElement(currentStep));
+};
+
+const emitEvent = (event: MockEvent) => {
+  act(() => {
+    currentProps().onEvent(event);
+  });
+};
+
+const emitStepAfter = (action: string, index: number) =>
+  emitEvent({ type: "step:after", action, index, status: "running" });
+
+const goToNextStep = (index: number) => emitStepAfter("next", index);
+
+const goToPrevStep = (index: number) => emitStepAfter("prev", index);
+
+const startTour = () => fireEvent.click(screen.getByRole("button", { name: "Get Started!" }));
+
+const startTourFromWelcome = () => {
+  renderTour({ welcome: true });
+  startTour();
+};
+
+const WELCOME_TITLE = "Welcome to Halstack Theme Generator";
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  joyrideState.last = undefined;
+  mockUseRouter.mockReturnValue({ query: {}, replace: routerReplace });
+});
+
+describe("Tour", () => {
+  it("does not show the welcome dialog or run the tour without the tour query parameter", () => {
+    renderTour();
+
+    expect(screen.queryByText(WELCOME_TITLE)).not.toBeInTheDocument();
+    expect(currentProps().run).toBe(false);
+  });
+
+  it("opens the welcome dialog from the Take a tour URL and removes the query parameter", () => {
+    renderTour({ welcome: true });
+
+    expect(screen.getByText(WELCOME_TITLE)).toBeInTheDocument();
+    expect(routerReplace).toHaveBeenCalledWith("/theme-generator/configuration", undefined, { shallow: true });
+    expect(currentProps().run).toBe(false);
+  });
+
+  it("closes the welcome dialog with Skip tour without starting the tour", () => {
+    renderTour({ welcome: true });
+    fireEvent.click(screen.getByRole("button", { name: "Skip tour" }));
+
+    expect(screen.queryByText(WELCOME_TITLE)).not.toBeInTheDocument();
+    expect(currentProps().run).toBe(false);
+  });
+
+  it("closes the welcome dialog with its close button without starting the tour", () => {
+    renderTour({ welcome: true });
+    fireEvent.click(screen.getByRole("button", { name: "Close dialog" }));
+
+    expect(screen.queryByText(WELCOME_TITLE)).not.toBeInTheDocument();
+    expect(currentProps().run).toBe(false);
+  });
+
+  it("closes the welcome dialog when the tour starts", () => {
+    startTourFromWelcome();
+
+    expect(screen.queryByText(WELCOME_TITLE)).not.toBeInTheDocument();
+    expect(currentProps().run).toBe(true);
+  });
+
+  it.each(SECTIONS)("starts section $section at its first step", ({ section, title }) => {
+    renderTour({ currentStep: section, welcome: true });
+    startTour();
+
+    expect(currentProps().run).toBe(true);
+    expect(currentProps().stepIndex).toBe(0);
+    expect(screen.getByText(title)).toBeInTheDocument();
+    expect(screen.getByText("1 / 3")).toBeInTheDocument();
+  });
+
+  it("does not start the following section when the welcome dialog was skipped", () => {
+    const { rerender } = renderTour({ welcome: true });
+    fireEvent.click(screen.getByRole("button", { name: "Skip tour" }));
+
+    rerender(tourElement(1));
+    expect(currentProps().run).toBe(false);
+  });
+
+  it("moves forward and back through the steps and reports the index", () => {
+    startTourFromWelcome();
+
+    goToNextStep(0);
+    expect(currentProps().stepIndex).toBe(1);
+    expect(onTourStepIndexChange).toHaveBeenLastCalledWith(1);
+    expect(screen.getByText("2 / 3")).toBeInTheDocument();
+
+    goToPrevStep(1);
+    expect(currentProps().stepIndex).toBe(0);
+    expect(onTourStepIndexChange).toHaveBeenLastCalledWith(0);
+  });
+
+  it("ignores step events with other actions", () => {
+    startTourFromWelcome();
+    onTourStepIndexChange.mockClear();
+
+    emitEvent({ type: "step:after", action: "update", index: 0 });
+    emitEvent({ type: "tour:start", action: "start", index: 0 });
+
+    expect(onTourStepIndexChange).not.toHaveBeenCalled();
+    expect(currentProps().stepIndex).toBe(0);
+  });
+
+  it("shows Skip step and the navigation controls on non-final steps", () => {
+    startTourFromWelcome();
+
+    expect(screen.getByRole("button", { name: "Skip step" })).toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: "Got it!" })).not.toBeInTheDocument();
+  });
+
+  it.each(["finished", "skipped", "paused"])("stops the tour when the status is %s", (status) => {
+    startTourFromWelcome();
+    emitEvent({ status, action: "next", index: 0, type: "tour:end" });
+
+    expect(currentProps().run).toBe(false);
+  });
+
+  it("stops the tour when the popover is closed", () => {
+    startTourFromWelcome();
+    emitEvent({ action: "close", status: "running", index: 0, type: "tour:end" });
+
+    expect(currentProps().run).toBe(false);
+  });
+
+  it("stops the tour when Skip step is clicked", () => {
+    startTourFromWelcome();
+    fireEvent.click(screen.getByRole("button", { name: "Skip step" }));
+
+    expect(currentProps().run).toBe(false);
+  });
+
+  it("finishes the tour from the last step with Got it!", () => {
+    startTourFromWelcome();
+    goToNextStep(0);
+    goToNextStep(1);
+
+    expect(screen.getByText("Upload assets")).toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: "Skip step" })).not.toBeInTheDocument();
+    fireEvent.click(screen.getByRole("button", { name: "Got it!" }));
+
+    expect(currentProps().run).toBe(false);
+  });
+
+  it("restarts the current section from its first step after a short delay", () => {
+    jest.useFakeTimers();
+    try {
+      startTourFromWelcome();
+      goToNextStep(0);
+      goToNextStep(1);
+      onTourStepIndexChange.mockClear();
+
+      fireEvent.click(screen.getByRole("button", { name: "Restart" }));
+
+      expect(currentProps().run).toBe(false);
+      expect(currentProps().stepIndex).toBe(0);
+      expect(onTourStepIndexChange).toHaveBeenLastCalledWith(0);
+
+      act(() => {
+        jest.advanceTimersByTime(100);
+      });
+      expect(currentProps().run).toBe(true);
+      expect(currentProps().stepIndex).toBe(0);
+    } finally {
+      jest.useRealTimers();
+    }
+  });
+
+  it("starts the next section automatically after the current one finishes", () => {
+    const { rerender } = renderTour({ welcome: true });
+    startTour();
+    emitEvent({ status: "finished", action: "next", index: 2, type: "tour:end" });
+    expect(currentProps().run).toBe(false);
+
+    rerender(tourElement(1));
+
+    expect(currentProps().run).toBe(true);
+    expect(currentProps().stepIndex).toBe(0);
+    expect(screen.getByText("Preview theme")).toBeInTheDocument();
+  });
+
+  it("does not start the next section again after the last section ends", () => {
+    const { rerender } = renderTour({ currentStep: 2, welcome: true });
+    startTour();
+    emitEvent({ status: "finished", action: "next", index: 2, type: "tour:end" });
+
+    rerender(tourElement(2));
+    expect(currentProps().run).toBe(false);
+  });
+});