diff --git a/tests/unit/cliproxy/config-generator.test.js b/tests/unit/cliproxy/config-generator.test.js
index 703b5fe6..fc8aa340 100644
--- a/tests/unit/cliproxy/config-generator.test.js
+++ b/tests/unit/cliproxy/config-generator.test.js
@@ -318,8 +318,10 @@ auth-dir: "/test"
 
       const userKeys = parseUserApiKeys(configContent);
 
-      // Empty strings should be filtered out (only truthy values)
-      assert.deepStrictEqual(userKeys, ['valid-key']);
+      // Empty strings should be filtered out - parseUserApiKeys checks: key && key !== CCS_INTERNAL_API_KEY
+      // Empty string is falsy, so it's excluded along with internal key
+      assert.strictEqual(userKeys.length, 1, 'Should filter out empty string key');
+      assert.deepStrictEqual(userKeys, ['valid-key'], 'Should only include valid non-empty keys');
     });
 
     it('handles config with Windows line endings', () => {
diff --git a/tests/unit/cliproxy/model-catalog.test.js b/tests/unit/cliproxy/model-catalog.test.js
index e583345b..0cd8beed 100644
--- a/tests/unit/cliproxy/model-catalog.test.js
+++ b/tests/unit/cliproxy/model-catalog.test.js
@@ -23,9 +23,15 @@ describe('Model Catalog', () => {
       assert.strictEqual(MODEL_CATALOG.gemini.displayName, 'Gemini');
     });
 
-    it('does not contain codex or qwen (not configurable)', () => {
+    it('contains Codex provider catalog', () => {
+      const { MODEL_CATALOG } = modelCatalog;
+      assert(MODEL_CATALOG.codex, 'Should have codex provider');
+      assert.strictEqual(MODEL_CATALOG.codex.provider, 'codex');
+      assert.strictEqual(MODEL_CATALOG.codex.displayName, 'Copilot Codex');
+    });
+
+    it('does not contain qwen (not configurable)', () => {
       const { MODEL_CATALOG } = modelCatalog;
-      assert.strictEqual(MODEL_CATALOG.codex, undefined);
       assert.strictEqual(MODEL_CATALOG.qwen, undefined);
     });
   });
@@ -115,9 +121,9 @@ describe('Model Catalog', () => {
       assert.strictEqual(supportsModelConfig('gemini'), true);
     });
 
-    it('returns false for codex', () => {
+    it('returns true for codex', () => {
       const { supportsModelConfig } = modelCatalog;
-      assert.strictEqual(supportsModelConfig('codex'), false);
+      assert.strictEqual(supportsModelConfig('codex'), true);
     });
 
     it('returns false for qwen', () => {
@@ -142,10 +148,12 @@ describe('Model Catalog', () => {
       assert.strictEqual(catalog.provider, 'gemini');
     });
 
-    it('returns undefined for codex', () => {
+    it('returns catalog for codex', () => {
       const { getProviderCatalog } = modelCatalog;
       const catalog = getProviderCatalog('codex');
-      assert.strictEqual(catalog, undefined);
+      assert(catalog, 'Should return catalog');
+      assert.strictEqual(catalog.provider, 'codex');
+      assert(Array.isArray(catalog.models));
     });
   });
 
diff --git a/tests/unit/cliproxy/model-config.test.js b/tests/unit/cliproxy/model-config.test.js
index ec6f3891..66d6aa25 100644
--- a/tests/unit/cliproxy/model-config.test.js
+++ b/tests/unit/cliproxy/model-config.test.js
@@ -38,12 +38,6 @@ describe('Model Config', () => {
   });
 
   describe('configureProviderModel', () => {
-    it('returns false for unsupported provider (codex)', async () => {
-      const { configureProviderModel } = modelConfig;
-      const result = await configureProviderModel('codex', true);
-      assert.strictEqual(result, false);
-    });
-
     it('returns false for unsupported provider (qwen)', async () => {
       const { configureProviderModel } = modelConfig;
       const result = await configureProviderModel('qwen', true);