diff --git a/.github/workflows/clt_tests.yml b/.github/workflows/clt_tests.yml
index b82093a1a9..df8e015684 100644
--- a/.github/workflows/clt_tests.yml
+++ b/.github/workflows/clt_tests.yml
@@ -50,7 +50,7 @@ jobs:
         test-suite:
           - name: Buddy
             test_prefix: test/clt-tests/buddy/
-          - name: Buddy-lugins
+          - name: Buddy-plugins
             test_prefix: test/clt-tests/buddy-plugins/
           - name: Bugs
             test_prefix: test/clt-tests/bugs/
@@ -62,8 +62,9 @@ jobs:
             test_prefix: test/clt-tests/expected-errors/
           - name: Fulltext-search
             test_prefix: test/clt-tests/fulltext-search/
-          - name: MCL
-            test_prefix: test/clt-tests/mcl/
+          - name: Auto-embeddings
+            test_prefix: test/clt-tests/ae/
+            skip_if_no_api_keys: true
           - name: HTTP interface tests
             test_prefix: test/clt-tests/http-interface/
           - name: Indexer
@@ -92,7 +93,19 @@ jobs:
             test_prefix: test/clt-tests/vector-knn/
               
     steps:
-      - uses: manticoresoftware/clt@0.7.3
+      - name: Check if auto-embeddings tests should be skipped
+        if: matrix.test-suite.skip_if_no_api_keys == true
+        run: |
+          if [ -z "$OPENAI_API_KEY" ] && [ -z "$VOYAGE_API_KEY" ] && [ -z "$JINA_API_KEY" ]; then
+            echo "SKIP_AE_TESTS=true" >> $GITHUB_ENV
+            echo "Skipping auto-embeddings tests - no API keys available"
+          else
+            echo "SKIP_AE_TESTS=false" >> $GITHUB_ENV
+          fi
+      
+      - name: Run CLT tests
+        if: matrix.test-suite.skip_if_no_api_keys != true || env.SKIP_AE_TESTS != 'true'
+        uses: manticoresoftware/clt@0.7.3
         with:
           artifact: ${{ inputs.artifact_name }}
           image: ${{ inputs.docker_image }}
@@ -102,3 +115,7 @@ jobs:
           comment_mode: failures
           run_args: "-e OPENAI_API_KEY -e VOYAGE_API_KEY -e JINA_API_KEY"
           ui_host: "https://clt.manticoresearch.com"
+      
+      - name: Skip auto-embeddings tests message
+        if: matrix.test-suite.skip_if_no_api_keys == true && env.SKIP_AE_TESTS == 'true'
+        run: echo "Auto-embeddings tests were skipped because no API keys (OPENAI_API_KEY, VOYAGE_API_KEY, JINA_API_KEY) are available"
diff --git a/test/clt-tests/mcl/auto-embeddings-backup-restore.rec b/test/clt-tests/ae/auto-embeddings-backup-restore.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-backup-restore.rec
rename to test/clt-tests/ae/auto-embeddings-backup-restore.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-concurrent.rec b/test/clt-tests/ae/auto-embeddings-concurrent.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-concurrent.rec
rename to test/clt-tests/ae/auto-embeddings-concurrent.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-dml-test.rec b/test/clt-tests/ae/auto-embeddings-dml-test.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-dml-test.rec
rename to test/clt-tests/ae/auto-embeddings-dml-test.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-duplicate-id.rec b/test/clt-tests/ae/auto-embeddings-duplicate-id.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-duplicate-id.rec
rename to test/clt-tests/ae/auto-embeddings-duplicate-id.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-edge-cases.rec b/test/clt-tests/ae/auto-embeddings-edge-cases.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-edge-cases.rec
rename to test/clt-tests/ae/auto-embeddings-edge-cases.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-endpoints.rec b/test/clt-tests/ae/auto-embeddings-endpoints.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-endpoints.rec
rename to test/clt-tests/ae/auto-embeddings-endpoints.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-error-handling.rec b/test/clt-tests/ae/auto-embeddings-error-handling.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-error-handling.rec
rename to test/clt-tests/ae/auto-embeddings-error-handling.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-from-vector-check.rec b/test/clt-tests/ae/auto-embeddings-from-vector-check.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-from-vector-check.rec
rename to test/clt-tests/ae/auto-embeddings-from-vector-check.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-hnsw-configs.rec b/test/clt-tests/ae/auto-embeddings-hnsw-configs.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-hnsw-configs.rec
rename to test/clt-tests/ae/auto-embeddings-hnsw-configs.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-jina-remote.rec b/test/clt-tests/ae/auto-embeddings-jina-remote.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-jina-remote.rec
rename to test/clt-tests/ae/auto-embeddings-jina-remote.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-json-api.rec b/test/clt-tests/ae/auto-embeddings-json-api.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-json-api.rec
rename to test/clt-tests/ae/auto-embeddings-json-api.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-knn-select-scenarios.rec b/test/clt-tests/ae/auto-embeddings-knn-select-scenarios.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-knn-select-scenarios.rec
rename to test/clt-tests/ae/auto-embeddings-knn-select-scenarios.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-openai-remote.rec b/test/clt-tests/ae/auto-embeddings-openai-remote.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-openai-remote.rec
rename to test/clt-tests/ae/auto-embeddings-openai-remote.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-syntax-check.rec b/test/clt-tests/ae/auto-embeddings-syntax-check.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-syntax-check.rec
rename to test/clt-tests/ae/auto-embeddings-syntax-check.rec
diff --git a/test/clt-tests/mcl/auto-embeddings-voyage-remote.rec b/test/clt-tests/ae/auto-embeddings-voyage-remote.rec
similarity index 100%
rename from test/clt-tests/mcl/auto-embeddings-voyage-remote.rec
rename to test/clt-tests/ae/auto-embeddings-voyage-remote.rec
diff --git a/test/clt-tests/mcl/base.recb b/test/clt-tests/ae/base.recb
similarity index 100%
rename from test/clt-tests/mcl/base.recb
rename to test/clt-tests/ae/base.recb