diff --git a/src/lib/skill-loader.ts b/src/lib/skill-loader.ts
index b416bd71..c443ebb0 100644
--- a/src/lib/skill-loader.ts
+++ b/src/lib/skill-loader.ts
@@ -40,7 +40,11 @@ Base directory for this skill: ${skillDir}/
 File references (@path) in this skill are relative to this directory.
 
 ${body.trim()}
-</skill-instruction>`
+</skill-instruction>
+
+<user-request>
+$ARGUMENTS
+</user-request>`
 }
 
 export function extractSkillBody(wrappedTemplate: string): string {
diff --git a/tests/unit/config-handler.test.ts b/tests/unit/config-handler.test.ts
index 0811147a..3cc58c73 100644
--- a/tests/unit/config-handler.test.ts
+++ b/tests/unit/config-handler.test.ts
@@ -4,11 +4,6 @@ import os from 'node:os'
 import path from 'node:path'
 import type { Config } from '@opencode-ai/sdk'
 import { createConfigHandler } from '../../src/lib/config-handler.ts'
-import {
-  formatSkillCommandName,
-  formatSkillDescription,
-  wrapSkillTemplate,
-} from '../../src/lib/skill-loader.ts'
 
 describe('config-handler', () => {
   let testDir: string
@@ -224,76 +219,3 @@ Command template for ${name}.`,
     })
   })
 })
-
-describe('formatSkillCommandName', () => {
-  test('adds systematic: prefix to plain name', () => {
-    expect(formatSkillCommandName('brainstorming')).toBe(
-      'systematic:brainstorming',
-    )
-  })
-
-  test('does not double-prefix already prefixed name', () => {
-    expect(formatSkillCommandName('systematic:brainstorming')).toBe(
-      'systematic:brainstorming',
-    )
-  })
-
-  test('handles empty string', () => {
-    expect(formatSkillCommandName('')).toBe('systematic:')
-  })
-})
-
-describe('formatSkillDescription', () => {
-  test('adds (systematic - Skill) prefix to description', () => {
-    expect(formatSkillDescription('A test skill', 'test')).toBe(
-      '(systematic - Skill) A test skill',
-    )
-  })
-
-  test('does not double-prefix already prefixed description', () => {
-    expect(
-      formatSkillDescription('(systematic - Skill) A test skill', 'test'),
-    ).toBe('(systematic - Skill) A test skill')
-  })
-
-  test('uses fallback name when description is empty', () => {
-    expect(formatSkillDescription('', 'my-skill')).toBe(
-      '(systematic - Skill) my-skill skill',
-    )
-  })
-})
-
-describe('wrapSkillTemplate', () => {
-  test('wraps content in skill-instruction tags', () => {
-    const result = wrapSkillTemplate('/path/to/skill/SKILL.md', '# Skill Body')
-    expect(result).toContain('<skill-instruction>')
-    expect(result).toContain('</skill-instruction>')
-    expect(result).toContain('# Skill Body')
-  })
-
-  test('includes base directory from skill path', () => {
-    const result = wrapSkillTemplate(
-      '/bundled/skills/brainstorming/SKILL.md',
-      '# Content',
-    )
-    expect(result).toContain(
-      'Base directory for this skill: /bundled/skills/brainstorming/',
-    )
-  })
-
-  test('includes file reference note', () => {
-    const result = wrapSkillTemplate('/path/to/skill/SKILL.md', '# Content')
-    expect(result).toContain(
-      'File references (@path) in this skill are relative to this directory',
-    )
-  })
-
-  test('trims body content', () => {
-    const result = wrapSkillTemplate(
-      '/path/to/skill/SKILL.md',
-      '  \n# Skill Body\n  ',
-    )
-    expect(result).toContain('# Skill Body')
-    expect(result).not.toMatch(/\n\s+\n<\/skill-instruction>/)
-  })
-})