diff --git a/frontend/components/assets/condition-badge.test.tsx b/frontend/components/assets/condition-badge.test.tsx
new file mode 100644
index 00000000..33d6bdc3
--- /dev/null
+++ b/frontend/components/assets/condition-badge.test.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { ConditionBadge } from './condition-badge';
+import { AssetCondition } from '@/lib/query/types/asset';
+
+describe('ConditionBadge', () => {
+  it('renders NEW condition with correct label and color', () => {
+    render(<ConditionBadge condition={AssetCondition.NEW} />);
+    const badge = screen.getByText('New');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-emerald-100');
+    expect(badge.className).toContain('text-emerald-800');
+  });
+
+  it('renders GOOD condition with correct label and color', () => {
+    render(<ConditionBadge condition={AssetCondition.GOOD} />);
+    const badge = screen.getByText('Good');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-green-100');
+    expect(badge.className).toContain('text-green-800');
+  });
+
+  it('renders FAIR condition with correct label and color', () => {
+    render(<ConditionBadge condition={AssetCondition.FAIR} />);
+    const badge = screen.getByText('Fair');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-yellow-100');
+    expect(badge.className).toContain('text-yellow-900');
+  });
+
+  it('renders POOR condition with correct label and color', () => {
+    render(<ConditionBadge condition={AssetCondition.POOR} />);
+    const badge = screen.getByText('Poor');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-orange-100');
+    expect(badge.className).toContain('text-orange-900');
+  });
+
+  it('renders DAMAGED condition with correct label and color', () => {
+    render(<ConditionBadge condition={AssetCondition.DAMAGED} />);
+    const badge = screen.getByText('Damaged');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-red-100');
+    expect(badge.className).toContain('text-red-800');
+  });
+
+  it('renders unknown condition with fallback styling', () => {
+    render(<ConditionBadge condition={'UNKNOWN' as AssetCondition} />);
+    const badge = screen.getByText('UNKNOWN');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-gray-100');
+    expect(badge.className).toContain('text-gray-700');
+  });
+});
diff --git a/frontend/components/assets/status-badge.test.tsx b/frontend/components/assets/status-badge.test.tsx
new file mode 100644
index 00000000..0814a439
--- /dev/null
+++ b/frontend/components/assets/status-badge.test.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { StatusBadge } from './status-badge';
+import { AssetStatus } from '@/lib/query/types/asset';
+
+describe('StatusBadge', () => {
+  it('renders ACTIVE status with correct label and color', () => {
+    render(<StatusBadge status={AssetStatus.ACTIVE} />);
+    const badge = screen.getByText('Active');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-green-100');
+    expect(badge.className).toContain('text-green-800');
+  });
+
+  it('renders ASSIGNED status with correct label and color', () => {
+    render(<StatusBadge status={AssetStatus.ASSIGNED} />);
+    const badge = screen.getByText('Assigned');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-blue-100');
+    expect(badge.className).toContain('text-blue-800');
+  });
+
+  it('renders MAINTENANCE status with correct label and color', () => {
+    render(<StatusBadge status={AssetStatus.MAINTENANCE} />);
+    const badge = screen.getByText('Maintenance');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-yellow-100');
+    expect(badge.className).toContain('text-yellow-900');
+  });
+
+  it('renders RETIRED status with correct label and color', () => {
+    render(<StatusBadge status={AssetStatus.RETIRED} />);
+    const badge = screen.getByText('Retired');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-gray-100');
+    expect(badge.className).toContain('text-gray-700');
+  });
+
+  it('renders unknown status with fallback styling', () => {
+    render(<StatusBadge status={'UNKNOWN' as AssetStatus} />);
+    const badge = screen.getByText('UNKNOWN');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-gray-100');
+    expect(badge.className).toContain('text-gray-700');
+  });
+});
diff --git a/frontend/components/assets/validation.test.tsx b/frontend/components/assets/validation.test.tsx
new file mode 100644
index 00000000..e905b70b
--- /dev/null
+++ b/frontend/components/assets/validation.test.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { StatusBadge } from './validation';
+import { AssetStatus } from '@/lib/query/types/asset';
+
+describe('validation.tsx StatusBadge', () => {
+  it('renders ACTIVE status with correct label and color', () => {
+    render(<StatusBadge status={AssetStatus.ACTIVE} />);
+    const badge = screen.getByText('Active');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-green-100');
+    expect(badge.className).toContain('text-green-700');
+  });
+
+  it('renders ASSIGNED status with correct label and color', () => {
+    render(<StatusBadge status={AssetStatus.ASSIGNED} />);
+    const badge = screen.getByText('Assigned');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-blue-100');
+    expect(badge.className).toContain('text-blue-700');
+  });
+
+  it('renders MAINTENANCE status with correct label and color', () => {
+    render(<StatusBadge status={AssetStatus.MAINTENANCE} />);
+    const badge = screen.getByText('Maintenance');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-yellow-100');
+    expect(badge.className).toContain('text-yellow-700');
+  });
+
+  it('renders RETIRED status with correct label and color', () => {
+    render(<StatusBadge status={AssetStatus.RETIRED} />);
+    const badge = screen.getByText('Retired');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-gray-100');
+    expect(badge.className).toContain('text-gray-500');
+  });
+
+  it('renders unknown status with fallback styling', () => {
+    render(<StatusBadge status={'UNKNOWN' as AssetStatus} />);
+    const badge = screen.getByText('UNKNOWN');
+    expect(badge).toBeInTheDocument();
+    expect(badge.className).toContain('bg-gray-100');
+    expect(badge.className).toContain('text-gray-500');
+  });
+});