diff --git a/tests/test_async_scraping.py b/tests/test_async_scraping.py
index df0fc97..b5ee9f2 100644
--- a/tests/test_async_scraping.py
+++ b/tests/test_async_scraping.py
@@ -13,10 +13,7 @@ from pathlib import Path
 from unittest.mock import Mock, patch, AsyncMock, MagicMock
 from collections import deque
 
-# Add cli directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent / 'cli'))
-
-from doc_scraper import DocToSkillConverter
+from skill_seekers.cli.doc_scraper import DocToSkillConverter
 
 
 class TestAsyncConfiguration(unittest.TestCase):
diff --git a/tests/test_estimate_pages.py b/tests/test_estimate_pages.py
index 30dae36..68a36c9 100644
--- a/tests/test_estimate_pages.py
+++ b/tests/test_estimate_pages.py
@@ -9,10 +9,7 @@ import json
 from pathlib import Path
 import sys
 
-# Add cli directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent / 'cli'))
-
-from estimate_pages import estimate_pages
+from skill_seekers.cli.estimate_pages import estimate_pages
 
 
 class TestEstimatePages(unittest.TestCase):
diff --git a/tests/test_package_skill.py b/tests/test_package_skill.py
index ec3a09f..dc1d366 100644
--- a/tests/test_package_skill.py
+++ b/tests/test_package_skill.py
@@ -9,10 +9,7 @@ import zipfile
 from pathlib import Path
 import sys
 
-# Add cli directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent / 'cli'))
-
-from package_skill import package_skill
+from skill_seekers.cli.package_skill import package_skill
 
 
 class TestPackageSkill(unittest.TestCase):
diff --git a/tests/test_parallel_scraping.py b/tests/test_parallel_scraping.py
index f8e1563..86fb181 100644
--- a/tests/test_parallel_scraping.py
+++ b/tests/test_parallel_scraping.py
@@ -13,10 +13,7 @@ from pathlib import Path
 from unittest.mock import Mock, patch, MagicMock
 from collections import deque
 
-# Add cli directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent / 'cli'))
-
-from doc_scraper import DocToSkillConverter
+from skill_seekers.cli.doc_scraper import DocToSkillConverter
 
 
 class TestParallelScrapingConfiguration(unittest.TestCase):
diff --git a/tests/test_unified.py b/tests/test_unified.py
index 2ff1943..aa6afa7 100644
--- a/tests/test_unified.py
+++ b/tests/test_unified.py
@@ -16,13 +16,10 @@ import pytest
 import tempfile
 from pathlib import Path
 
-# Add CLI to path
-sys.path.insert(0, str(Path(__file__).parent.parent / 'cli'))
-
-from config_validator import ConfigValidator, validate_config
-from conflict_detector import ConflictDetector, Conflict
-from merge_sources import RuleBasedMerger
-from unified_skill_builder import UnifiedSkillBuilder
+from skill_seekers.cli.config_validator import ConfigValidator, validate_config
+from skill_seekers.cli.conflict_detector import ConflictDetector, Conflict
+from skill_seekers.cli.merge_sources import RuleBasedMerger
+from skill_seekers.cli.unified_skill_builder import UnifiedSkillBuilder
 
 
 # ===========================
diff --git a/tests/test_unified_mcp_integration.py b/tests/test_unified_mcp_integration.py
index d8053c8..753813f 100644
--- a/tests/test_unified_mcp_integration.py
+++ b/tests/test_unified_mcp_integration.py
@@ -15,10 +15,7 @@ from pathlib import Path
 # Configure pytest to only use asyncio backend (not trio)
 pytestmark = pytest.mark.anyio
 
-# Add skill_seeker_mcp to path
-sys.path.insert(0, str(Path(__file__).parent.parent / 'skill_seeker_mcp'))
-
-from server import validate_config_tool, scrape_docs_tool
+from skill_seekers.mcp.server import validate_config_tool, scrape_docs_tool
 
 
 async def test_mcp_validate_unified_config():
diff --git a/tests/test_upload_skill.py b/tests/test_upload_skill.py
index f763a83..a5e8d51 100644
--- a/tests/test_upload_skill.py
+++ b/tests/test_upload_skill.py
@@ -10,10 +10,7 @@ import os
 from pathlib import Path
 import sys
 
-# Add cli directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent / 'cli'))
-
-from upload_skill import upload_skill_api
+from skill_seekers.cli.upload_skill import upload_skill_api
 
 
 class TestUploadSkillAPI(unittest.TestCase):
diff --git a/tests/test_utilities.py b/tests/test_utilities.py
index 5832681..6026e7b 100644
--- a/tests/test_utilities.py
+++ b/tests/test_utilities.py
@@ -10,10 +10,7 @@ import zipfile
 from pathlib import Path
 import sys
 
-# Add cli directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent / 'cli'))
-
-from utils import (
+from skill_seekers.cli.utils import (
     has_api_key,
     get_api_key,
     get_upload_url,