diff --git a/tests/test_docker_validation.py b/tests/test_docker_validation.py
index a982bfb64..d75e2470b 100644
--- a/tests/test_docker_validation.py
+++ b/tests/test_docker_validation.py
@@ -7,13 +7,13 @@ import pytest
 from crewai import Agent
 
 
-@patch('crewai.utilities.i18n.I18N.load_prompts')
+@patch('crewai.utilities.i18n.I18N')
 class TestDockerValidation:
     """Test cases for Docker validation in Agent."""
 
-    def test_docker_validation_skipped_with_env_var(self, mock_load_prompts):
+    def test_docker_validation_skipped_with_env_var(self, mock_i18n):
         """Test that Docker validation is skipped when CREWAI_SKIP_DOCKER_VALIDATION=true."""
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         with patch.dict(os.environ, {"CREWAI_SKIP_DOCKER_VALIDATION": "true"}):
             agent = Agent(
                 role="Test Agent",
@@ -23,9 +23,9 @@ class TestDockerValidation:
             )
             assert agent.allow_code_execution is True
 
-    def test_docker_validation_skipped_with_unsafe_mode(self, mock_load_prompts):
+    def test_docker_validation_skipped_with_unsafe_mode(self, mock_i18n):
         """Test that Docker validation is skipped when code_execution_mode='unsafe'."""
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         agent = Agent(
             role="Test Agent",
             goal="Test goal", 
@@ -36,10 +36,10 @@ class TestDockerValidation:
         assert agent.code_execution_mode == "unsafe"
 
     @patch("crewai.agent.os.path.exists")
-    def test_docker_validation_skipped_in_container_dockerenv(self, mock_exists, mock_load_prompts):
+    def test_docker_validation_skipped_in_container_dockerenv(self, mock_exists, mock_i18n):
         """Test that Docker validation is skipped when /.dockerenv exists."""
         mock_exists.return_value = True
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         
         agent = Agent(
             role="Test Agent",
@@ -51,10 +51,10 @@ class TestDockerValidation:
 
     @patch("crewai.agent.os.path.exists")
     @patch("builtins.open", new_callable=mock_open, read_data="12:memory:/docker/container123")
-    def test_docker_validation_skipped_in_container_cgroup(self, mock_file, mock_exists, mock_load_prompts):
+    def test_docker_validation_skipped_in_container_cgroup(self, mock_file, mock_exists, mock_i18n):
         """Test that Docker validation is skipped when cgroup indicates container."""
         mock_exists.return_value = False
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         
         agent = Agent(
             role="Test Agent",
@@ -67,11 +67,11 @@ class TestDockerValidation:
     @patch("crewai.agent.os.path.exists")
     @patch("crewai.agent.os.getpid")
     @patch("builtins.open", side_effect=FileNotFoundError)
-    def test_docker_validation_skipped_in_container_pid1(self, mock_file, mock_getpid, mock_exists, mock_load_prompts):
+    def test_docker_validation_skipped_in_container_pid1(self, mock_file, mock_getpid, mock_exists, mock_i18n):
         """Test that Docker validation is skipped when running as PID 1."""
         mock_exists.return_value = False
         mock_getpid.return_value = 1
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         
         agent = Agent(
             role="Test Agent", 
@@ -85,12 +85,12 @@ class TestDockerValidation:
     @patch("crewai.agent.os.path.exists")
     @patch("crewai.agent.os.getpid")
     @patch("builtins.open", side_effect=FileNotFoundError)
-    def test_docker_validation_fails_no_docker(self, mock_file, mock_getpid, mock_exists, mock_which, mock_load_prompts):
+    def test_docker_validation_fails_no_docker(self, mock_file, mock_getpid, mock_exists, mock_which, mock_i18n):
         """Test that Docker validation fails when Docker is not installed."""
         mock_exists.return_value = False
         mock_getpid.return_value = 1000
         mock_which.return_value = None
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         
         with pytest.raises(RuntimeError, match="Docker is not installed"):
             Agent(
@@ -105,13 +105,13 @@ class TestDockerValidation:
     @patch("crewai.agent.os.path.exists")
     @patch("crewai.agent.os.getpid")
     @patch("builtins.open", side_effect=FileNotFoundError)
-    def test_docker_validation_fails_docker_not_running(self, mock_file, mock_getpid, mock_exists, mock_run, mock_which, mock_load_prompts):
+    def test_docker_validation_fails_docker_not_running(self, mock_file, mock_getpid, mock_exists, mock_run, mock_which, mock_i18n):
         """Test that Docker validation fails when Docker daemon is not running."""
         mock_exists.return_value = False
         mock_getpid.return_value = 1000
         mock_which.return_value = "/usr/bin/docker"
         mock_run.side_effect = subprocess.CalledProcessError(1, "docker info")
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         
         with pytest.raises(RuntimeError, match="Docker is not running"):
             Agent(
@@ -126,13 +126,13 @@ class TestDockerValidation:
     @patch("crewai.agent.os.path.exists")
     @patch("crewai.agent.os.getpid")
     @patch("builtins.open", side_effect=FileNotFoundError)
-    def test_docker_validation_passes_docker_available(self, mock_file, mock_getpid, mock_exists, mock_run, mock_which, mock_load_prompts):
+    def test_docker_validation_passes_docker_available(self, mock_file, mock_getpid, mock_exists, mock_run, mock_which, mock_i18n):
         """Test that Docker validation passes when Docker is available."""
         mock_exists.return_value = False
         mock_getpid.return_value = 1000
         mock_which.return_value = "/usr/bin/docker"
         mock_run.return_value = Mock(returncode=0)
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         
         agent = Agent(
             role="Test Agent",
@@ -142,9 +142,9 @@ class TestDockerValidation:
         )
         assert agent.allow_code_execution is True
 
-    def test_container_detection_methods(self, mock_load_prompts):
+    def test_container_detection_methods(self, mock_i18n):
         """Test the container detection logic directly."""
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         agent = Agent(
             role="Test Agent",
             goal="Test goal", 
@@ -163,9 +163,9 @@ class TestDockerValidation:
              patch("crewai.agent.os.getpid", return_value=1):
             assert agent._is_running_in_container() is True
 
-    def test_reproduce_original_issue(self, mock_load_prompts):
+    def test_reproduce_original_issue(self, mock_i18n):
         """Test that reproduces the original issue from GitHub issue #3028."""
-        mock_load_prompts.return_value = None
+        mock_i18n.return_value = MagicMock()
         
         with patch("crewai.agent.os.path.exists", return_value=True):
             agent = Agent(