diff --git a/.github/workflows/pr-smoke-test.yml b/.github/workflows/pr-smoke-test.yml
index 17c8047e..3f7e836d 100644
--- a/.github/workflows/pr-smoke-test.yml
+++ b/.github/workflows/pr-smoke-test.yml
@@ -108,7 +108,7 @@ jobs:
           node-version: '22'
 
       - name: Install agentic providers
-        run: npm install -g @anthropic-ai/claude-code @openai/codex @google/gemini-cli @zed-industries/claude-agent-acp @zed-industries/codex-acp
+        run: npm install -g @anthropic-ai/claude-code @zed-industries/claude-agent-acp @zed-industries/codex-acp
 
       - name: Run Smoke Tests with Provider Script
         env:
diff --git a/crates/goose/src/providers/chatgpt_codex.rs b/crates/goose/src/providers/chatgpt_codex.rs
index 2aca9799..03f20788 100644
--- a/crates/goose/src/providers/chatgpt_codex.rs
+++ b/crates/goose/src/providers/chatgpt_codex.rs
@@ -62,22 +62,6 @@ pub const CHATGPT_CODEX_KNOWN_MODELS: &[ChatGptCodexModelAttrs] = &[
         name: "gpt-5.3-codex",
         reasoning_levels: &["low", "medium", "high", "xhigh"],
     },
-    ChatGptCodexModelAttrs {
-        name: "gpt-5.2-codex",
-        reasoning_levels: &["low", "medium", "high", "xhigh"],
-    },
-    ChatGptCodexModelAttrs {
-        name: "gpt-5.1-codex",
-        reasoning_levels: &["low", "medium", "high", "xhigh"],
-    },
-    ChatGptCodexModelAttrs {
-        name: "gpt-5.1-codex-mini",
-        reasoning_levels: &["medium", "high"],
-    },
-    ChatGptCodexModelAttrs {
-        name: "gpt-5.1-codex-max",
-        reasoning_levels: &["low", "medium", "high", "xhigh"],
-    },
 ];
 
 const CHATGPT_CODEX_DOC_URL: &str = "https://openai.com/chatgpt";
diff --git a/scripts/test_providers_lib.sh b/scripts/test_providers_lib.sh
index 0ef52f12..cc0eff66 100755
--- a/scripts/test_providers_lib.sh
+++ b/scripts/test_providers_lib.sh
@@ -16,10 +16,8 @@ venice -> llama-3.3-70b
 litellm -> gpt-4o-mini
 sagemaker_tgi -> sagemaker-tgi-endpoint
 github_copilot -> gpt-4.1
-chatgpt_codex -> gpt-5.1-codex
+chatgpt_codex -> gpt-5.4
 claude-code -> default
-codex -> gpt-5.2-codex
-gemini-cli -> gemini-2.5-pro
 cursor-agent -> auto
 ollama -> qwen3
 "
@@ -33,7 +31,7 @@ ALLOWED_FAILURES=(
   "openai:gpt-3.5-turbo"
 )
 
-AGENTIC_PROVIDERS=("claude-code" "codex" "gemini-cli" "cursor-agent")
+AGENTIC_PROVIDERS=("claude-code" "cursor-agent")
 
 if [ -f .env ]; then
   export $(grep -v '^#' .env | xargs)
@@ -73,11 +71,9 @@ is_provider_available() {
     litellm)         has_env LITELLM_API_KEY ;;
     sagemaker_tgi)   has_env SAGEMAKER_ENDPOINT_NAME && has_env AWS_REGION ;;
     github_copilot)  has_env GITHUB_COPILOT_TOKEN || has_file "$HOME/.config/goose/github_copilot_token.json" ;;
-    chatgpt_codex)   has_env CHATGPT_CODEX_TOKEN || has_file "$HOME/.config/goose/chatgpt_codex_token.json" ;;
+    chatgpt_codex)   has_env CHATGPT_CODEX_TOKEN || has_file "$HOME/.config/goose/chatgpt_codex/tokens.json" ;;
     ollama)          has_env OLLAMA_HOST || has_cmd ollama ;;
     claude-code)     has_cmd claude ;;
-    codex)           has_cmd codex ;;
-    gemini-cli)      has_cmd gemini ;;
     cursor-agent)    has_cmd cursor-agent ;;
     *)               return 0 ;;
   esac