diff --git a/apps/docs/src/remix/remix-checkbox-list.stories.tsx b/apps/docs/src/remix/remix-checkbox-list.stories.tsx
index abcff10c..37a129fd 100644
--- a/apps/docs/src/remix/remix-checkbox-list.stories.tsx
+++ b/apps/docs/src/remix/remix-checkbox-list.stories.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { RemixCheckbox } from '@lambdacurry/forms/remix/remix-checkbox';
-import { Button } from '@lambdacurry/forms/ui/button';
+import { Button } from '@lambdacurry/forms/test/button';
 import { FormMessage } from '@lambdacurry/forms/ui/form';
 import type { ActionFunctionArgs } from '@remix-run/node';
 import { useFetcher } from '@remix-run/react';
diff --git a/apps/docs/src/remix/remix-checkbox.stories.tsx b/apps/docs/src/remix/remix-checkbox.stories.tsx
index 99264cd1..d293c4c1 100644
--- a/apps/docs/src/remix/remix-checkbox.stories.tsx
+++ b/apps/docs/src/remix/remix-checkbox.stories.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { RemixCheckbox } from '@lambdacurry/forms/remix/remix-checkbox';
-import { Button } from '@lambdacurry/forms/ui/button';
+import { Button } from '@lambdacurry/forms/test/button';
 import type { ActionFunctionArgs } from '@remix-run/node';
 import { useFetcher } from '@remix-run/react';
 import type { Meta, StoryContext, StoryObj } from '@storybook/react';
diff --git a/apps/docs/src/remix/remix-date-picker.stories.tsx b/apps/docs/src/remix/remix-date-picker.stories.tsx
index 4158456b..785245dd 100644
--- a/apps/docs/src/remix/remix-date-picker.stories.tsx
+++ b/apps/docs/src/remix/remix-date-picker.stories.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { RemixDatePicker } from '@lambdacurry/forms/remix/remix-date-picker';
-import { Button } from '@lambdacurry/forms/ui/button';
+import { Button } from '@lambdacurry/forms/test/button';
 import type { ActionFunctionArgs } from '@remix-run/node';
 import { Form, useFetcher } from '@remix-run/react';
 import type { Meta, StoryContext, StoryObj } from '@storybook/react';
diff --git a/apps/docs/src/remix/remix-dropdown-menu-select.stories.tsx b/apps/docs/src/remix/remix-dropdown-menu-select.stories.tsx
index 5102a1d5..3f489f53 100644
--- a/apps/docs/src/remix/remix-dropdown-menu-select.stories.tsx
+++ b/apps/docs/src/remix/remix-dropdown-menu-select.stories.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { RemixDropdownMenuSelect } from '@lambdacurry/forms/remix/remix-dropdown-menu-select';
-import { Button } from '@lambdacurry/forms/ui/button';
+import { Button } from '@lambdacurry/forms/test/button';
 import { DropdownMenuItem } from '@lambdacurry/forms/ui/dropdown-menu';
 import type { ActionFunctionArgs } from '@remix-run/node';
 import { Form, useFetcher } from '@remix-run/react';
diff --git a/apps/docs/src/remix/remix-otp-input.stories.tsx b/apps/docs/src/remix/remix-otp-input.stories.tsx
index 3c5fe430..6d2a5cad 100644
--- a/apps/docs/src/remix/remix-otp-input.stories.tsx
+++ b/apps/docs/src/remix/remix-otp-input.stories.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { RemixOTPInputField } from '@lambdacurry/forms/remix/remix-otp-input';
-import { Button } from '@lambdacurry/forms/ui/button';
+import { Button } from '@lambdacurry/forms/test/button';
 import type { ActionFunctionArgs } from '@remix-run/node';
 import { Form, useFetcher } from '@remix-run/react';
 import type { Meta, StoryContext, StoryObj } from '@storybook/react';
diff --git a/apps/docs/src/remix/remix-radio-group.stories.tsx b/apps/docs/src/remix/remix-radio-group.stories.tsx
index 8d4ddefe..fda03868 100644
--- a/apps/docs/src/remix/remix-radio-group.stories.tsx
+++ b/apps/docs/src/remix/remix-radio-group.stories.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { RemixRadioGroupField } from '@lambdacurry/forms/remix/remix-radio-group';
-import { Button } from '@lambdacurry/forms/ui/button';
+import { Button } from '@lambdacurry/forms/test/button';
 import { RadioGroupItem } from '@lambdacurry/forms/ui/radio-group';
 import type { ActionFunctionArgs } from '@remix-run/node';
 import { Form, useFetcher } from '@remix-run/react';
diff --git a/apps/docs/src/remix/remix-switch.stories.tsx b/apps/docs/src/remix/remix-switch.stories.tsx
index 1e7f304d..7174f391 100644
--- a/apps/docs/src/remix/remix-switch.stories.tsx
+++ b/apps/docs/src/remix/remix-switch.stories.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { RemixSwitch } from '@lambdacurry/forms/remix/remix-switch';
-import { Button } from '@lambdacurry/forms/ui/button';
+import { Button } from '@lambdacurry/forms/test/button';
 import type { ActionFunctionArgs } from '@remix-run/node';
 import { useFetcher } from '@remix-run/react';
 import type { Meta, StoryContext, StoryObj } from '@storybook/react';
diff --git a/apps/docs/src/remix/remix-text-field.stories.tsx b/apps/docs/src/remix/remix-text-field.stories.tsx
index 2dc7c3d3..9319bad6 100644
--- a/apps/docs/src/remix/remix-text-field.stories.tsx
+++ b/apps/docs/src/remix/remix-text-field.stories.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { RemixTextField } from '@lambdacurry/forms/remix/remix-text-field';
-import { Button } from '@lambdacurry/forms/ui/button';
+import { Button } from '@lambdacurry/forms/test/button';
 import type { ActionFunctionArgs } from '@remix-run/node';
 import { useFetcher } from '@remix-run/react';
 import type { Meta, StoryContext, StoryObj } from '@storybook/react';
diff --git a/apps/docs/src/remix/remix-textarea.stories.tsx b/apps/docs/src/remix/remix-textarea.stories.tsx
index e6658f93..f019bd67 100644
--- a/apps/docs/src/remix/remix-textarea.stories.tsx
+++ b/apps/docs/src/remix/remix-textarea.stories.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { RemixTextarea } from '@lambdacurry/forms/remix/remix-textarea';
-import { Button } from '@lambdacurry/forms/ui/button';
+import { Button } from '@lambdacurry/forms/test/button';
 import type { ActionFunctionArgs } from '@remix-run/node';
 import { useFetcher } from '@remix-run/react';
 import type { Meta, StoryContext, StoryObj } from '@storybook/react';
diff --git a/packages/components/src/ui/button.tsx b/packages/components/src/test/button.tsx
similarity index 88%
rename from packages/components/src/ui/button.tsx
rename to packages/components/src/test/button.tsx
index b09044cc..c0f6b8be 100644
--- a/packages/components/src/ui/button.tsx
+++ b/packages/components/src/test/button.tsx
@@ -1,8 +1,7 @@
 import { Slot } from '@radix-ui/react-slot';
 import { type VariantProps, cva } from 'class-variance-authority';
-// biome-ignore lint/style/noNamespaceImport: prevents React undefined errors when exporting as a component library
 import * as React from 'react';
-import { cn } from './utils';
+import { cn } from '../ui/utils';
 
 const buttonVariants = cva(
   'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
@@ -30,7 +29,7 @@ const buttonVariants = cva(
   },
 );
 
-export interface ButtonProps
+interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
   asChild?: boolean;
@@ -44,4 +43,4 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 );
 Button.displayName = 'Button';
 
-export { Button, buttonVariants };
+export { Button, buttonVariants };
\ No newline at end of file
diff --git a/packages/components/src/ui/date-picker-field.tsx b/packages/components/src/ui/date-picker-field.tsx
index d60b1324..e0035077 100644
--- a/packages/components/src/ui/date-picker-field.tsx
+++ b/packages/components/src/ui/date-picker-field.tsx
@@ -3,7 +3,7 @@ import { Calendar as CalendarIcon } from 'lucide-react';
 // biome-ignore lint/style/noNamespaceImport: prevents React undefined errors when exporting as a component library
 import * as React from 'react';
 import type { Control, FieldPath, FieldValues } from 'react-hook-form';
-import { Button } from './button';
+import { Button } from '../test/button';
 import { DatePicker } from './date-picker';
 import {
   type FieldComponents,
diff --git a/packages/components/src/ui/date-picker.tsx b/packages/components/src/ui/date-picker.tsx
index 6e703259..94490fd2 100644
--- a/packages/components/src/ui/date-picker.tsx
+++ b/packages/components/src/ui/date-picker.tsx
@@ -1,7 +1,7 @@
 import { ChevronLeft, ChevronRight } from 'lucide-react';
 import type * as React from 'react';
 import { type CustomComponents, DayPicker } from 'react-day-picker';
-import { buttonVariants } from './button';
+import { buttonVariants } from '../test/button';
 import { cn } from './utils';
 
 export type DatePickerProps = React.ComponentProps<typeof DayPicker>;
diff --git a/packages/components/src/ui/dropdown-menu-select-field.tsx b/packages/components/src/ui/dropdown-menu-select-field.tsx
index 8353724c..01998b98 100644
--- a/packages/components/src/ui/dropdown-menu-select-field.tsx
+++ b/packages/components/src/ui/dropdown-menu-select-field.tsx
@@ -3,7 +3,7 @@ import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
 // biome-ignore lint/style/noNamespaceImport: prevents React undefined errors when exporting as a component library
 import * as React from 'react';
 import type { Control, FieldPath, FieldValues } from 'react-hook-form';
-import { Button } from './button';
+import { Button } from '../test/button';
 import { DropdownMenuContent } from './dropdown-menu';
 import {
   type FieldComponents,
diff --git a/packages/components/src/ui/index.ts b/packages/components/src/ui/index.ts
index 567fd5e1..6b39a2d3 100644
--- a/packages/components/src/ui/index.ts
+++ b/packages/components/src/ui/index.ts
@@ -1,4 +1,3 @@
-export * from './button';
 export * from './checkbox-field';
 export * from './date-picker';
 export * from './date-picker-field';