diff --git a/test_runner/fixtures/neon_cli.py b/test_runner/fixtures/neon_cli.py
index 390efe0309..c5ca05d2fd 100644
--- a/test_runner/fixtures/neon_cli.py
+++ b/test_runner/fixtures/neon_cli.py
@@ -530,7 +530,10 @@ class NeonLocalCli(AbstractNeonCli):
             args.extend(["--external-http-port", str(external_http_port)])
         if internal_http_port is not None:
             args.extend(["--internal-http-port", str(internal_http_port)])
-        if grpc:
+
+        # XXX: By checking for None, we enable the new communicator for all tests
+        # by default
+        if grpc or grpc is None:
             args.append("--grpc")
         if endpoint_id is not None:
             args.append(endpoint_id)
diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py
index f15b6c6595..b0a33981a7 100644
--- a/test_runner/fixtures/neon_fixtures.py
+++ b/test_runner/fixtures/neon_fixtures.py
@@ -4779,17 +4779,6 @@ class Endpoint(PgProtocol, LogUtils):
         # and make tests more stable.
         config_lines += ["max_replication_write_lag=15MB"]
 
-        # If gRPC is enabled, use the new communicator too.
-        #
-        # NB: the communicator is enabled by default, so force it to false otherwise.
-        #
-        # XXX: By checking for None, we enable the new communicator for all tests
-        # by default
-        if grpc or grpc is None:
-            config_lines += ["neon.use_communicator_worker=on"]
-        else:
-            config_lines += ["neon.use_communicator_worker=off"]
-
         # Delete file cache if it exists (and we're recreating the endpoint)
         if USE_LFC:
             if (lfc_path := Path(self.lfc_path())).exists():