diff --git a/tests/TextInput.test.svelte b/tests/TextInput.test.svelte
deleted file mode 100644
index 63b5dd87..00000000
--- a/tests/TextInput.test.svelte
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts">
-  import { TextInput, TextInputSkeleton } from "carbon-components-svelte";
-  import type { ComponentProps } from "svelte";
-
-  let value: ComponentProps<TextInput>["value"] = null;
-</script>
-
-<TextInput
-  type="number"
-  labelText="User name"
-  placeholder="Enter user name..."
-  bind:value
-  on:input={(e) => console.log(e.detail)}
-  on:change={(e) => (value = e.detail)}
-  on:paste={(e) => console.log(e)}
-/>
-
-<TextInput
-  labelText="User name"
-  helperText="Your user name is associated with your email"
-  placeholder="Enter user name..."
-/>
-
-<TextInput hideLabel labelText="User name" placeholder="Enter user name..." />
-
-<TextInput light labelText="User name" placeholder="Enter user name..." />
-
-<TextInput inline labelText="User name" placeholder="Enter user name..." />
-
-<TextInput size="xl" labelText="User name" placeholder="Enter user name..." />
-
-<TextInput size="sm" labelText="User name" placeholder="Enter user name..." />
-
-<TextInput
-  invalid
-  invalidText="User name is already taken. Please try another."
-  labelText="User name"
-  placeholder="Enter user name..."
-/>
-
-<TextInput disabled labelText="User name" placeholder="Enter user name..." />
-
-<TextInputSkeleton />
-
-<TextInputSkeleton hideLabel />
diff --git a/tests/TextInput/TextInput.test.svelte b/tests/TextInput/TextInput.test.svelte
new file mode 100644
index 00000000..5dc88aac
--- /dev/null
+++ b/tests/TextInput/TextInput.test.svelte
@@ -0,0 +1,55 @@
+<script lang="ts">
+  import { TextInput } from "carbon-components-svelte";
+  import type { ComponentProps } from "svelte";
+
+  export let value: ComponentProps<TextInput>["value"] = "";
+  export let placeholder = "";
+  export let size: ComponentProps<TextInput>["size"] = undefined;
+  export let light = false;
+  export let disabled = false;
+  export let helperText = "";
+  export let labelText = "User name";
+  export let hideLabel = false;
+  export let invalid = false;
+  export let invalidText = "";
+  export let warn = false;
+  export let warnText = "";
+  export let id = "ccs-test";
+  export let name: ComponentProps<TextInput>["name"] = undefined;
+  export let ref: ComponentProps<TextInput>["ref"] = null;
+  export let required = false;
+  export let inline = false;
+  export let readonly = false;
+  export let type: ComponentProps<TextInput>["type"] = "text";
+</script>
+
+<TextInput
+  bind:value
+  {placeholder}
+  {size}
+  {light}
+  {disabled}
+  {helperText}
+  {labelText}
+  {hideLabel}
+  {invalid}
+  {invalidText}
+  {warn}
+  {warnText}
+  {id}
+  {name}
+  {ref}
+  {required}
+  {inline}
+  {readonly}
+  {type}
+  on:change
+  on:input
+  on:keydown
+  on:keyup
+  on:focus
+  on:blur
+  on:paste
+/>
+
+<div data-testid="value">{value}</div>
diff --git a/tests/TextInput/TextInput.test.ts b/tests/TextInput/TextInput.test.ts
new file mode 100644
index 00000000..74271739
--- /dev/null
+++ b/tests/TextInput/TextInput.test.ts
@@ -0,0 +1,198 @@
+import { render, screen } from "@testing-library/svelte";
+import { user } from "../setup-tests";
+import TextInput from "./TextInput.test.svelte";
+import TextInputCustom from "./TextInputCustom.test.svelte";
+
+describe("TextInput", () => {
+  it("should render with default props", () => {
+    render(TextInput);
+
+    expect(screen.getByLabelText("User name")).toBeInTheDocument();
+  });
+
+  it("should handle placeholder text", () => {
+    render(TextInput, {
+      props: { placeholder: "Enter user name..." },
+    });
+
+    expect(
+      screen.getByPlaceholderText("Enter user name..."),
+    ).toBeInTheDocument();
+  });
+
+  it("should handle different sizes", () => {
+    (["sm", "xl"] as const).forEach((size) => {
+      const { container } = render(TextInput, {
+        props: { size },
+      });
+
+      const input = container.querySelector("input");
+      expect(input).toHaveClass(`bx--text-input--${size}`);
+      container.remove();
+    });
+  });
+
+  it("should handle light variant", () => {
+    render(TextInput, { props: { light: true } });
+
+    expect(screen.getByRole("textbox")).toHaveClass("bx--text-input--light");
+  });
+
+  it("should handle disabled state", () => {
+    render(TextInput, { props: { disabled: true } });
+
+    const input = screen.getByRole("textbox");
+    expect(input).toBeDisabled();
+    expect(screen.getByText("User name")).toHaveClass("bx--label--disabled");
+  });
+
+  it("should handle helper text", () => {
+    render(TextInput, { props: { helperText: "Helper text" } });
+
+    expect(screen.getByText("Helper text")).toHaveClass(
+      "bx--form__helper-text",
+    );
+  });
+
+  it("should handle invalid state", () => {
+    render(TextInput, {
+      props: { invalid: true, invalidText: "Invalid input" },
+    });
+
+    const input = screen.getByRole("textbox");
+    expect(input).toHaveClass("bx--text-input--invalid");
+    expect(input).toHaveAttribute("aria-invalid", "true");
+    expect(screen.getByText("Invalid input")).toHaveClass(
+      "bx--form-requirement",
+    );
+  });
+
+  it("should handle warning state", () => {
+    render(TextInput, {
+      props: { warn: true, warnText: "Warning message" },
+    });
+
+    const input = screen.getByRole("textbox");
+    expect(input).toHaveClass("bx--text-input--warning");
+    expect(screen.getByText("Warning message")).toHaveClass(
+      "bx--form-requirement",
+    );
+  });
+
+  it("should handle hidden label", () => {
+    render(TextInput, { props: { hideLabel: true } });
+
+    expect(screen.getByText("User name")).toHaveClass("bx--visually-hidden");
+  });
+
+  it("should handle custom id", () => {
+    render(TextInput, { props: { id: "custom-id" } });
+
+    const input = screen.getByRole("textbox");
+    expect(input).toHaveAttribute("id", "custom-id");
+    expect(screen.getByText("User name")).toHaveAttribute("for", "custom-id");
+  });
+
+  it("should handle custom name", () => {
+    render(TextInput, { props: { name: "custom-name" } });
+
+    expect(screen.getByRole("textbox")).toHaveAttribute("name", "custom-name");
+  });
+
+  it("should handle required state", () => {
+    render(TextInput, { props: { required: true } });
+
+    expect(screen.getByRole("textbox")).toHaveAttribute("required");
+  });
+
+  it("should handle inline variant", () => {
+    render(TextInput, { props: { inline: true } });
+
+    expect(screen.getByText("User name")).toHaveClass("bx--label--inline");
+  });
+
+  it("should handle readonly state", () => {
+    render(TextInput, {
+      props: { readonly: true },
+    });
+
+    expect(screen.getByRole("textbox")).toHaveAttribute("readonly");
+  });
+
+  it("should handle custom slots", () => {
+    render(TextInputCustom);
+
+    expect(screen.getByText("Custom Label Text").tagName).toBe("SPAN");
+  });
+
+  it("should handle value binding", async () => {
+    render(TextInput);
+
+    const input = screen.getByRole("textbox");
+    await user.type(input, "Test value");
+    expect(screen.getByTestId("value").textContent).toBe("Test value");
+  });
+
+  it("should handle number type input", async () => {
+    render(TextInput, { props: { type: "number" } });
+
+    const input = screen.getByLabelText("User name");
+    await user.type(input, "123");
+    expect(input).toHaveValue(123);
+
+    await user.clear(input);
+    expect(input).toHaveValue(null);
+  });
+
+  it("should not show helper text when invalid", () => {
+    render(TextInput, {
+      props: {
+        invalid: true,
+        invalidText: "Invalid input",
+        helperText: "Helper text",
+      },
+    });
+
+    expect(screen.queryByText("Helper text")).not.toBeInTheDocument();
+    expect(screen.getByText("Invalid input")).toBeInTheDocument();
+  });
+
+  it("should not show helper text when warning", () => {
+    render(TextInput, {
+      props: {
+        warn: true,
+        warnText: "Warning message",
+        helperText: "Helper text",
+      },
+    });
+
+    expect(screen.queryByText("Helper text")).not.toBeInTheDocument();
+    expect(screen.getByText("Warning message")).toBeInTheDocument();
+  });
+
+  it("should handle disabled helper text", () => {
+    render(TextInput, {
+      props: {
+        disabled: true,
+        helperText: "Helper text",
+      },
+    });
+
+    expect(screen.getByText("Helper text")).toHaveClass(
+      "bx--form__helper-text--disabled",
+    );
+  });
+
+  it("should handle inline helper text", () => {
+    render(TextInput, {
+      props: {
+        inline: true,
+        helperText: "Helper text",
+      },
+    });
+
+    expect(screen.getByText("Helper text")).toHaveClass(
+      "bx--form__helper-text--inline",
+    );
+  });
+});
diff --git a/tests/TextInput/TextInputCustom.test.svelte b/tests/TextInput/TextInputCustom.test.svelte
new file mode 100644
index 00000000..2eea26dc
--- /dev/null
+++ b/tests/TextInput/TextInputCustom.test.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+  import { TextInput } from "carbon-components-svelte";
+</script>
+
+<TextInput labelText="Custom label">
+  <span slot="labelText">Custom Label Text</span>
+</TextInput>