diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index 580e3ca..b130015 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -262,13 +262,20 @@ func TestConfig_Load(t *testing.T) {
 	t.Run("creates default config when none exists", func(t *testing.T) {
 		tempDir := t.TempDir()
 		originalConfigDir := os.Getenv("XDG_CONFIG_HOME")
+		originalAPIKey := os.Getenv("OPENAI_API_KEY")
 		os.Setenv("XDG_CONFIG_HOME", tempDir)
+		os.Setenv("OPENAI_API_KEY", "test-api-key") // Set test API key for validation
 		defer func() {
 			if originalConfigDir == "" {
 				os.Unsetenv("XDG_CONFIG_HOME")
 			} else {
 				os.Setenv("XDG_CONFIG_HOME", originalConfigDir)
 			}
+			if originalAPIKey == "" {
+				os.Unsetenv("OPENAI_API_KEY")
+			} else {
+				os.Setenv("OPENAI_API_KEY", originalAPIKey)
+			}
 		}()
 
 		config, err := Load()
@@ -362,13 +369,20 @@ func TestConfig_SaveDefaultConfig(t *testing.T) {
 	// Override the config path by setting environment variable
 	tempDir := t.TempDir()
 	originalConfigDir := os.Getenv("XDG_CONFIG_HOME")
+	originalAPIKey := os.Getenv("OPENAI_API_KEY")
 	os.Setenv("XDG_CONFIG_HOME", tempDir)
+	os.Setenv("OPENAI_API_KEY", "test-api-key") // Set test API key for validation
 	defer func() {
 		if originalConfigDir == "" {
 			os.Unsetenv("XDG_CONFIG_HOME")
 		} else {
 			os.Setenv("XDG_CONFIG_HOME", originalConfigDir)
 		}
+		if originalAPIKey == "" {
+			os.Unsetenv("OPENAI_API_KEY")
+		} else {
+			os.Setenv("OPENAI_API_KEY", originalAPIKey)
+		}
 	}()
 
 	err := SaveDefaultConfig()