diff --git a/monkey/tests/unit_tests/monkey_island/cc/conftest.py b/monkey/tests/unit_tests/monkey_island/cc/conftest.py
index 4bccfd862..4a40765a5 100644
--- a/monkey/tests/unit_tests/monkey_island/cc/conftest.py
+++ b/monkey/tests/unit_tests/monkey_island/cc/conftest.py
@@ -1,11 +1,3 @@
-import monkey_island.cc.environment.environment_singleton as env_singleton
-from monkey_island.cc.environment.testing import TestingEnvironment
-
-# Mock environment singleton because it contains mongodb parameters
-# needed for model tests. See monkey/monkey_island/cc/models/__init__.py
-env_config = {}
-env_singleton.env = TestingEnvironment(env_config)
-
 # Without these imports pytests can't use fixtures,
 # because they are not found
 from tests.unit_tests.monkey_island.cc.mongomock_fixtures import *  # noqa: F401,F403,E402
diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/test_config.py b/monkey/tests/unit_tests/monkey_island/cc/services/test_config.py
index c5e30dbd2..cc0e94ceb 100644
--- a/monkey/tests/unit_tests/monkey_island/cc/services/test_config.py
+++ b/monkey/tests/unit_tests/monkey_island/cc/services/test_config.py
@@ -19,6 +19,18 @@ def config(monkeypatch):
     return config
 
 
+class MockClass:
+    pass
+
+
+@pytest.fixture(scope="function", autouse=True)
+def mock_port_in_env_singleton(monkeypatch):
+    mock_singleton = MockClass()
+    mock_singleton.env = MockClass()
+    mock_singleton.env.get_island_port = lambda: PORT
+    monkeypatch.setattr("monkey_island.cc.services.config.env_singleton", mock_singleton)
+
+
 def test_set_server_ips_in_config_command_servers(config):
     ConfigService.set_server_ips_in_config(config)
     expected_config_command_servers = [f"{ip}:{PORT}" for ip in IPS]
diff --git a/monkey/tests/unit_tests/monkey_island/cc/setup/test_process_runner.py b/monkey/tests/unit_tests/monkey_island/cc/setup/test_process_runner.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/whitelist.py b/whitelist.py
index 6739d4791..e943c2729 100644
--- a/whitelist.py
+++ b/whitelist.py
@@ -166,8 +166,7 @@ IBM  # unused variable (monkey/common/cloud/environment_names.py:11)
 DigitalOcean  # unused variable (monkey/common/cloud/environment_names.py:12)
 _.aws_info  # unused attribute (monkey/monkey_island/cc/environment/aws.py:13)
 build_from_config_file_contents  # unused method 'build_from_config_file_contents' (\monkey_island\setup\island_config_options.py:18)
-fake_db_dir  # unused function 'fake_db_dir' (monkey/tests/unit_tests/monkey_island/cc/setup/test_process_runner.py:10)
-
+mock_port_in_env_singleton  # monkey\tests\unit_tests\monkey_island\cc\services\test_config.py:26:
 
 # these are not needed for it to work, but may be useful extra information to understand what's going on
 WINDOWS_PBA_TYPE  # unused variable (monkey/monkey_island/cc/resources/pba_file_upload.py:23)