diff --git a/.github/workflows/cli_tests.yml b/.github/workflows/cli_tests.yml
index 7086d341f..958d341ae 100644
--- a/.github/workflows/cli_tests.yml
+++ b/.github/workflows/cli_tests.yml
@@ -60,7 +60,7 @@ jobs:
           python-version: ${{ inputs.python-version }}
 
       - name: Run CLI Unit Tests
-        run: uv run pytest cognee/tests/unit/cli/ -v
+        run: uv run pytest cognee/tests/cli_tests/cli_unit_tests/ -v
 
   cli-integration-tests:
     name: CLI Integration Tests
@@ -87,7 +87,7 @@ jobs:
           python-version: ${{ inputs.python-version }}
 
       - name: Run CLI Integration Tests
-        run: uv run pytest cognee/tests/integration/cli/ -v
+        run: uv run pytest cognee/tests/cli_tests/cli_integration_tests/ -v
 
   cli-functionality-tests:
     name: CLI Functionality Tests
@@ -135,12 +135,12 @@ jobs:
         run: |
           # Test invalid command (should fail gracefully)
           ! uv run python -m cognee.cli._cognee invalid_command
-          
+
           # Test missing required arguments (should fail gracefully)
           ! uv run python -m cognee.cli._cognee search
-          
+
           # Test invalid search type (should fail gracefully)
           ! uv run python -m cognee.cli._cognee search "test" --query-type INVALID_TYPE
-          
+
           # Test invalid chunker (should fail gracefully)
           ! uv run python -m cognee.cli._cognee cognify --chunker InvalidChunker
diff --git a/.github/workflows/test_suites.yml b/.github/workflows/test_suites.yml
index b6e84ac1e..86f89249d 100644
--- a/.github/workflows/test_suites.yml
+++ b/.github/workflows/test_suites.yml
@@ -34,49 +34,49 @@ jobs:
 
   docker-compose-test:
     name: Docker Compose Test
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/docker_compose.yml
     secrets: inherit
 
   docker-ci-test:
     name: Docker CI test
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/backend_docker_build_test.yml
     secrets: inherit
 
   graph-db-tests:
     name: Graph Database Tests
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/graph_db_tests.yml
     secrets: inherit
 
   temporal-graph-tests:
     name: Temporal Graph Test
-    needs: [ basic-tests, e2e-tests, cli-tests, graph-db-tests ]
+    needs: [ basic-tests, e2e-tests, graph-db-tests ]
     uses: ./.github/workflows/temporal_graph_tests.yml
     secrets: inherit
 
   search-db-tests:
     name: Search Test on Different DBs
-    needs: [basic-tests, e2e-tests, cli-tests, graph-db-tests]
+    needs: [basic-tests, e2e-tests, graph-db-tests]
     uses: ./.github/workflows/search_db_tests.yml
     secrets: inherit
 
   relational-db-migration-tests:
     name: Relational DB Migration Tests
-    needs: [basic-tests, e2e-tests, cli-tests, graph-db-tests]
+    needs: [basic-tests, e2e-tests, graph-db-tests]
     uses: ./.github/workflows/relational_db_migration_tests.yml
     secrets: inherit
 
   notebook-tests:
     name: Notebook Tests
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/notebooks_tests.yml
     secrets: inherit
 
   different-operating-systems-tests:
     name: Operating System and Python Tests
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/test_different_operating_systems.yml
     with:
       python-versions: '["3.10.x", "3.11.x", "3.12.x"]'
@@ -85,20 +85,20 @@ jobs:
   # Matrix-based vector database tests
   vector-db-tests:
     name: Vector DB Tests
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/vector_db_tests.yml
     secrets: inherit
 
   # Matrix-based example tests
   example-tests:
     name: Example Tests
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/examples_tests.yml
     secrets: inherit
 
   mcp-test:
     name: MCP Tests
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/test_mcp.yml
     secrets: inherit
 
@@ -110,20 +110,20 @@ jobs:
 
   s3-file-storage-test:
     name: S3 File Storage Test
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/test_s3_file_storage.yml
     secrets: inherit
 
   # Additional LLM tests
   gemini-tests:
     name: Gemini Tests
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/test_gemini.yml
     secrets: inherit
 
   openrouter-tests:
     name: OpenRouter Tests
-    needs: [basic-tests, e2e-tests, cli-tests]
+    needs: [basic-tests, e2e-tests]
     uses: ./.github/workflows/test_openrouter.yml
     secrets: inherit
 
@@ -133,7 +133,6 @@ jobs:
     needs: [
       basic-tests,
       e2e-tests,
-      cli-tests,
       graph-db-tests,
       notebook-tests,
       different-operating-systems-tests,
diff --git a/cognee/tests/integration/cli/__init__.py b/cognee/tests/cli_tests/cli_integration_tests/__init__.py
similarity index 100%
rename from cognee/tests/integration/cli/__init__.py
rename to cognee/tests/cli_tests/cli_integration_tests/__init__.py
diff --git a/cognee/tests/integration/cli/test_cli_integration.py b/cognee/tests/cli_tests/cli_integration_tests/test_cli_integration.py
similarity index 100%
rename from cognee/tests/integration/cli/test_cli_integration.py
rename to cognee/tests/cli_tests/cli_integration_tests/test_cli_integration.py
diff --git a/cognee/tests/unit/cli/__init__.py b/cognee/tests/cli_tests/cli_unit_tests/__init__.py
similarity index 100%
rename from cognee/tests/unit/cli/__init__.py
rename to cognee/tests/cli_tests/cli_unit_tests/__init__.py
diff --git a/cognee/tests/unit/cli/test_cli_commands.py b/cognee/tests/cli_tests/cli_unit_tests/test_cli_commands.py
similarity index 100%
rename from cognee/tests/unit/cli/test_cli_commands.py
rename to cognee/tests/cli_tests/cli_unit_tests/test_cli_commands.py
diff --git a/cognee/tests/unit/cli/test_cli_edge_cases.py b/cognee/tests/cli_tests/cli_unit_tests/test_cli_edge_cases.py
similarity index 100%
rename from cognee/tests/unit/cli/test_cli_edge_cases.py
rename to cognee/tests/cli_tests/cli_unit_tests/test_cli_edge_cases.py
diff --git a/cognee/tests/unit/cli/test_cli_main.py b/cognee/tests/cli_tests/cli_unit_tests/test_cli_main.py
similarity index 100%
rename from cognee/tests/unit/cli/test_cli_main.py
rename to cognee/tests/cli_tests/cli_unit_tests/test_cli_main.py
diff --git a/cognee/tests/unit/cli/test_cli_runner.py b/cognee/tests/cli_tests/cli_unit_tests/test_cli_runner.py
similarity index 100%
rename from cognee/tests/unit/cli/test_cli_runner.py
rename to cognee/tests/cli_tests/cli_unit_tests/test_cli_runner.py
diff --git a/cognee/tests/unit/cli/test_cli_utils.py b/cognee/tests/cli_tests/cli_unit_tests/test_cli_utils.py
similarity index 100%
rename from cognee/tests/unit/cli/test_cli_utils.py
rename to cognee/tests/cli_tests/cli_unit_tests/test_cli_utils.py