diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ICommunicationChannel.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ICommunicationChannel.cs
index 4727c2875b..dc8330ffe3 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ICommunicationChannel.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/Communication/ICommunicationChannel.cs
@@ -2,8 +2,11 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
 namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 
 public interface ICommunicationChannel : IDisposable
@@ -11,7 +14,7 @@ public interface ICommunicationChannel : IDisposable
     /// <summary>
     /// Event raised when data is received on the communication channel.
     /// </summary>
-    event EventHandler<MessageReceivedEventArgs> MessageReceived;
+    TrackableEvent<MessageReceivedEventArgs> MessageReceived { get; }
 
     /// <summary>
     /// Frames and sends the provided data over communication channel.
@@ -24,5 +27,51 @@ public interface ICommunicationChannel : IDisposable
     /// Notification from server/client that data is available.
     /// </summary>
     /// <returns>A <see cref="Task"/> implying async nature of the function.</returns>
-    Task NotifyDataAvailable();
+    Task NotifyDataAvailable(CancellationToken cancellationToken);
+}
+
+#pragma warning disable CA1001 // Types that own disposable fields should be disposable
+public class TrackableEvent<T>
+#pragma warning restore CA1001 // Types that own disposable fields should be disposable
+{
+    private readonly ManualResetEventSlim _slim;
+
+    internal event EventHandler<T>? Event;
+
+    public TrackableEvent()
+    {
+        _slim = new ManualResetEventSlim(Event != null);
+    }
+
+    public virtual void Notify(object sender, T eventArgs, string traceDisplayName)
+    {
+        var e = Event;
+        if (e != null)
+        {
+            e.SafeInvoke(sender, eventArgs!, traceDisplayName);
+        }
+    }
+
+    public virtual bool WaitForSubscriber(int timeoutMilliseconds, CancellationToken cancellationToken)
+    {
+        return _slim.Wait(timeoutMilliseconds, cancellationToken);
+    }
+
+    public virtual void Subscribe(EventHandler<T>? eventHandler)
+    {
+        Event += eventHandler;
+        if (Event != null)
+        {
+            _slim.Set();
+        }
+    }
+
+    public virtual void Unsubscribe(EventHandler<T>? eventHandler)
+    {
+        Event -= eventHandler;
+        if (Event == null)
+        {
+            _slim.Reset();
+        }
+    }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/LengthPrefixCommunicationChannel.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/LengthPrefixCommunicationChannel.cs
index 293a5a683b..9e53f03560 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/LengthPrefixCommunicationChannel.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/LengthPrefixCommunicationChannel.cs
@@ -4,12 +4,12 @@
 using System;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
-using Microsoft.VisualStudio.TestPlatform.Utilities;
 
 namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 
@@ -37,7 +37,7 @@ public LengthPrefixCommunicationChannel(Stream stream)
     }
 
     /// <inheritdoc />
-    public event EventHandler<MessageReceivedEventArgs>? MessageReceived;
+    public TrackableEvent<MessageReceivedEventArgs> MessageReceived { get; } = new TrackableEvent<MessageReceivedEventArgs>();
 
     /// <inheritdoc />
     public Task Send(string data)
@@ -71,7 +71,7 @@ public Task Send(string data)
     }
 
     /// <inheritdoc />
-    public Task NotifyDataAvailable()
+    public Task NotifyDataAvailable(CancellationToken cancellationToken)
     {
         try
         {
@@ -85,14 +85,10 @@ public Task NotifyDataAvailable()
             // Try read data even if no one is listening to the data stream. Some server
             // implementations (like Sockets) depend on the read operation to determine if a
             // connection is closed.
-            if (MessageReceived != null)
+            if (MessageReceived.WaitForSubscriber(1000, cancellationToken))
             {
                 var data = _reader.ReadString();
-                MessageReceived.SafeInvoke(this, new MessageReceivedEventArgs { Data = data }, "LengthPrefixCommunicationChannel: MessageReceived");
-            }
-            else
-            {
-                EqtTrace.Verbose("LengthPrefixCommunicationChannel.NotifyDataAvailable: New data are waiting to be received, but there is no subscriber to be notified. Not reading them from the stream.");
+                MessageReceived.Notify(this, new MessageReceivedEventArgs { Data = data }, "LengthPrefixCommunicationChannel: MessageReceived");
             }
         }
         catch (ObjectDisposedException ex) when (!_reader.BaseStream.CanRead)
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Shipped.txt
index d769708077..d9ce642e6c 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/PublicAPI.Shipped.txt
@@ -100,8 +100,6 @@ Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.Disconnect
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.DisconnectedEventArgs.Error.get -> System.Exception?
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.DisconnectedEventArgs.Error.set -> void
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel
-Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel.MessageReceived -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs!>!
-Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel.NotifyDataAvailable() -> System.Threading.Tasks.Task!
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel.Send(string! data) -> System.Threading.Tasks.Task!
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndPoint
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationEndPoint.Connected -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ConnectedEventArgs!>!
@@ -189,8 +187,6 @@ Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerializer.Se
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.Dispose() -> void
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.LengthPrefixCommunicationChannel(System.IO.Stream! stream) -> void
-Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.MessageReceived -> System.EventHandler<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs!>?
-Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.NotifyDataAvailable() -> System.Threading.Tasks.Task!
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.Send(string! data) -> System.Threading.Tasks.Task!
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message
 Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Message.Message() -> void
@@ -392,3 +388,13 @@ static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.JsonDataSerial
 ~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.UnexpectedMessage.get -> string
 ~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.VersionCheckFailed.get -> string
 ~static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.VersionCheckTimedout.get -> string
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.TrackableEvent() -> void
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.Unsubscribe(System.EventHandler<T>? eventHandler) -> void
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.WaitForSubscriber(int timeoutMilliseconds, System.Threading.CancellationToken cancellationToken) -> bool
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.Notify(object! sender, T eventArgs, string! traceDisplayName) -> void
+virtual Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<T>.Subscribe(System.EventHandler<T>? eventHandler) -> void
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel.MessageReceived.get -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs!>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.MessageReceived.get -> Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.TrackableEvent<Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.MessageReceivedEventArgs!>!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces.ICommunicationChannel.NotifyDataAvailable(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.LengthPrefixCommunicationChannel.NotifyDataAvailable(System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/TcpClientExtensions.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/TcpClientExtensions.cs
index 97a06447d1..c89ec6e31c 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/TcpClientExtensions.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/TcpClientExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
@@ -40,17 +41,30 @@ internal static Task MessageLoopAsync(
                 socketException);
         }
 
+        // PERF: check if verbose is enabled once, and re-use for all calls in the tight loop below. The check for verbose is shows in perf traces
+        // below and we are wasting resources re-checking when user does not have it open. Downside of this is that if you change the verbosity level
+        // during runtime (e.g. in VS options), you won't update here. Which is imho an okay tradeoff.
+        var isVerboseEnabled = EqtTrace.IsVerboseEnabled;
+
+        var sw = Stopwatch.StartNew();
         // Set read timeout to avoid blocking receive raw message
         while (channel != null && !cancellationToken.IsCancellationRequested)
         {
-            EqtTrace.Verbose("TcpClientExtensions.MessageLoopAsync: Polling on remoteEndPoint: {0} localEndPoint: {1}", remoteEndPoint, localEndPoint);
+            if (isVerboseEnabled)
+            {
+                EqtTrace.Verbose("TcpClientExtensions.MessageLoopAsync: Polling on remoteEndPoint: {0} localEndPoint: {1} after {2} ms", remoteEndPoint, localEndPoint, sw.ElapsedMilliseconds);
+                sw.Restart();
+            }
 
             try
             {
                 if (client.Client.Poll(Streamreadtimeout, SelectMode.SelectRead))
                 {
-                    EqtTrace.Verbose("TcpClientExtensions.MessageLoopAsync: NotifyDataAvailable remoteEndPoint: {0} localEndPoint: {1}", remoteEndPoint, localEndPoint);
-                    channel.NotifyDataAvailable();
+                    if (isVerboseEnabled)
+                    {
+                        EqtTrace.Verbose("TcpClientExtensions.MessageLoopAsync: NotifyDataAvailable remoteEndPoint: {0} localEndPoint: {1}", remoteEndPoint, localEndPoint);
+                    }
+                    channel.NotifyDataAvailable(cancellationToken);
                 }
             }
             catch (IOException ioException)
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs
index e42427b4ac..ad0b614463 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs
@@ -194,7 +194,7 @@ private bool TrySetupMessageReceiver(
         }
 
         _onMessageReceived = onMessageReceived;
-        _channel.MessageReceived += _onMessageReceived;
+        _channel.MessageReceived.Subscribe(_onMessageReceived);
 
         return true;
     }
@@ -269,7 +269,7 @@ public void CheckVersionWithTestHost()
 
             protocolNegotiated.Set();
         };
-        _channel.MessageReceived += onMessageReceived;
+        _channel.MessageReceived.Subscribe(onMessageReceived);
 
         try
         {
@@ -290,7 +290,7 @@ public void CheckVersionWithTestHost()
         }
         finally
         {
-            _channel.MessageReceived -= onMessageReceived;
+            _channel.MessageReceived.Unsubscribe(onMessageReceived);
         }
     }
 
@@ -516,9 +516,9 @@ public void Close()
     /// <inheritdoc />
     public void Dispose()
     {
-        if (_channel != null)
+        if (_channel != null && _onMessageReceived != null)
         {
-            _channel.MessageReceived -= _onMessageReceived;
+            _channel.MessageReceived.Unsubscribe(_onMessageReceived);
         }
 
         _communicationEndpoint.Stop();
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelOperationManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelOperationManager.cs
index df2ef9133a..d1374c7e25 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelOperationManager.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelOperationManager.cs
@@ -18,7 +18,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client;
 /// </summary>
 internal sealed class ParallelOperationManager<TManager, TEventHandler, TWorkload> : IDisposable
 {
-    private const int PreStart = 0;
+    private const int PreStart = 2;
     private readonly static int VSTEST_HOSTPRESTART_COUNT =
         int.TryParse(
                 Environment.GetEnvironmentVariable(nameof(VSTEST_HOSTPRESTART_COUNT)),
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
index c24ac37f0f..0c9fb56ed2 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
@@ -132,7 +132,7 @@ public virtual void InitializeCommunication()
                 throw connectedArgs.Fault;
             }
             _channel = connectedArgs.Channel;
-            _channel.MessageReceived += OnMessageReceived;
+            _channel.MessageReceived.Subscribe(OnMessageReceived);
             _requestSenderConnected.Set();
         };
 
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs
index a7bb370079..dc8f12225b 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Performance/SocketTests.cs
@@ -41,7 +41,7 @@ public void SocketThroughput2()
         server.Connected += (sender, args) =>
         {
             serverChannel = args.Channel;
-            serverChannel!.MessageReceived += (channel, messageReceived) =>
+            serverChannel!.MessageReceived.Subscribe((channel, messageReceived) =>
             {
                 // Keep count of bytes
                 dataReceived += messageReceived.Data!.Length;
@@ -51,7 +51,7 @@ public void SocketThroughput2()
                     dataTransferred.Set();
                     watch.Stop();
                 }
-            };
+            });
 
             clientConnected.Set();
         };
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketClientTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketClientTests.cs
index 91b2e826f4..e899a02567 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketClientTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketClientTests.cs
@@ -158,9 +158,9 @@ private ManualResetEvent SetupClientDisconnect(out ICommunicationChannel? channe
         var waitEvent = new ManualResetEvent(false);
         _socketClient.Disconnected += (s, e) => waitEvent.Set();
         channel = SetupChannel(out ConnectedEventArgs? _);
-        channel!.MessageReceived += (sender, args) =>
+        channel!.MessageReceived.Subscribe((sender, args) =>
         {
-        };
+        });
         return waitEvent;
     }
 
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketServerTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketServerTests.cs
index b64a9e4304..1c392218f3 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketServerTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketServerTests.cs
@@ -125,9 +125,9 @@ public void SocketServerShouldRaiseClientDisconnectedEventIfConnectionIsBroken()
         };
         var channel = SetupChannel(out ConnectedEventArgs? clientConnected);
 
-        channel!.MessageReceived += (sender, args) =>
+        channel!.MessageReceived.Subscribe((sender, args) =>
         {
-        };
+        });
 
         // Close the client channel. Message loop should stop.
         // tcpClient.Close() calls tcpClient.Dispose().
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketTestsBase.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketTestsBase.cs
index 6716c8c11c..22fb46e655 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketTestsBase.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.Platform.UnitTests/SocketTestsBase.cs
@@ -32,11 +32,11 @@ public void SocketEndpointShouldNotifyChannelOnDataAvailable()
     {
         var message = string.Empty;
         ManualResetEvent waitForMessage = new(false);
-        SetupChannel(out ConnectedEventArgs? _)!.MessageReceived += (s, e) =>
+        SetupChannel(out ConnectedEventArgs? _)!.MessageReceived.Subscribe((s, e) =>
         {
             message = e.Data;
             waitForMessage.Set();
-        };
+        });
 
         WriteData(Client!);
 
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/LengthPrefixCommunicationChannelTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/LengthPrefixCommunicationChannelTests.cs
index 68aefe4392..92d65f9115 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/LengthPrefixCommunicationChannelTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/LengthPrefixCommunicationChannelTests.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
 using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
@@ -88,11 +89,11 @@ public async Task SendShouldFlushTheStream()
     public async Task MessageReceivedShouldProvideDataOverStream()
     {
         var data = string.Empty;
-        _channel.MessageReceived += (sender, messageEventArgs) => data = messageEventArgs.Data;
+        _channel.MessageReceived.Subscribe((sender, messageEventArgs) => data = messageEventArgs.Data);
         _writer.Write(Dummydata);
         SeekToBeginning(_stream);
 
-        await _channel.NotifyDataAvailable();
+        await _channel.NotifyDataAvailable(new CancellationToken());
 
         Assert.AreEqual(Dummydata, data);
     }
@@ -103,7 +104,7 @@ public async Task NotifyDataAvailableShouldNotReadStreamIfNoListenersAreRegister
         _writer.Write(Dummydata);
         SeekToBeginning(_stream);
 
-        await _channel.NotifyDataAvailable();
+        await _channel.NotifyDataAvailable(new CancellationToken());
 
         // Data is read irrespective of listeners. See note in NotifyDataAvailable
         // implementation.
@@ -131,10 +132,10 @@ public async Task DoNotFailWhenWritingOnADisposedBaseStream()
     public async Task DoNotFailWhenReadingFromADisposedBaseStream()
     {
         var data = string.Empty;
-        _channel.MessageReceived += (sender, messageEventArgs) => data = messageEventArgs.Data;
+        _channel.MessageReceived.Subscribe((sender, messageEventArgs) => data = messageEventArgs.Data);
         // Dispose base stream
         _stream.Dispose();
-        await _channel.NotifyDataAvailable();
+        await _channel.NotifyDataAvailable(new CancellationToken());
     }
 
     // TODO
diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs
index 6212a426c5..3fa3d0c968 100644
--- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs
+++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/TestRequestSenderTests.cs
@@ -52,6 +52,7 @@ public TestRequestSenderTests()
             Transport = Transport.Sockets
         };
         _mockChannel = new Mock<ICommunicationChannel>();
+        _mockChannel.Setup(mc => mc.MessageReceived).Returns(new TrackableEvent<MessageReceivedEventArgs>());
         _mockServer = new Mock<ICommunicationEndPoint>();
         _mockDataSerializer = new Mock<IDataSerializer>();
         _testRequestSender = new TestableTestRequestSender(_mockServer.Object, _connectionInfo, _mockDataSerializer.Object, new ProtocolConfig { Version = Dummyprotocolversion });
@@ -868,14 +869,14 @@ private void SetupFakeChannelWithVersionNegotiation()
         SetupFakeCommunicationChannel();
         _testRequestSender.CheckVersionWithTestHost();
         ResetRaiseMessageReceivedOnCheckVersion();
+
+        _mockChannel.Setup(mc => mc.MessageReceived).Returns(new TrackableEvent<MessageReceivedEventArgs>());
     }
 
     private void RaiseMessageReceivedEvent()
     {
-        _mockChannel.Raise(
-            c => c.MessageReceived += null,
-            _mockChannel.Object,
-            new MessageReceivedEventArgs { Data = "DummyData" });
+        var eventArgs = new MessageReceivedEventArgs { Data = "DummyData" };
+        _mockChannel.Object.MessageReceived.Notify(_mockChannel.Object, eventArgs, "TestRequestSenderTests.RaiseMessageReceivedEvent()");
     }
 
     private void RaiseClientDisconnectedEvent()
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyExecutionManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyExecutionManagerTests.cs
index 061e6c00a2..3e1e4bab0f 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyExecutionManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyExecutionManagerTests.cs
@@ -285,7 +285,11 @@ public void StartTestRunShouldProcessAllSourcesOnExecutionAbortsForAnySource()
 
         Assert.IsTrue(_executionCompleted.Wait(Timeout3Seconds), "Test run not completed.");
 
-        Assert.AreEqual(2, _processedSources.Count, "Abort should stop all sources execution.");
+        // Even though we start the test run for two sources, because of the current setup where
+        // we initialize a proxy if no more slots are available, we end up with abort notice being
+        // sent only to the running manager. This leaves the initialized manager in limbo and the
+        // assert will fail because of this.
+        Assert.AreEqual(1, _processedSources.Count, "Abort should stop all sources execution.");
     }
 
     [TestMethod]
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyBaseManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyBaseManagerTests.cs
index 00ca31373c..f9483d82bb 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyBaseManagerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyBaseManagerTests.cs
@@ -45,6 +45,7 @@ public ProxyBaseManagerTests()
         _mockDataSerializer = new Mock<IDataSerializer>();
         _mockRequestData = new Mock<IRequestData>();
         _mockChannel = new Mock<ICommunicationChannel>();
+        _mockChannel.Setup(mc => mc.MessageReceived).Returns(new TrackableEvent<MessageReceivedEventArgs>());
         _mockFileHelper = new Mock<IFileHelper>();
         _discoveryDataAggregator = new();
 
@@ -87,7 +88,7 @@ private void SetupAndInitializeTestRequestSender()
     public void SetupChannelMessage<TPayload>(string messageType, string returnMessageType, TPayload returnPayload)
     {
         _mockChannel.Setup(mc => mc.Send(It.Is<string>(s => s.Contains(messageType))))
-            .Callback(() => _mockChannel.Raise(c => c.MessageReceived += null, _mockChannel.Object, new MessageReceivedEventArgs { Data = messageType }));
+            .Callback(() => _mockChannel.Object.MessageReceived.Notify(_mockChannel.Object, new MessageReceivedEventArgs { Data = messageType }, "ProxyBaseManagerTests.SetupChannelMessage()"));
 
         _mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>())).Returns(messageType);
         _mockDataSerializer.Setup(ds => ds.SerializePayload(It.Is<string>(s => s.Equals(messageType)), It.IsAny<object>(), It.IsAny<int>())).Returns(messageType);
@@ -97,8 +98,9 @@ public void SetupChannelMessage<TPayload>(string messageType, string returnMessa
 
     public void RaiseMessageReceived(string data)
     {
-        _mockChannel.Raise(c => c.MessageReceived += null, _mockChannel.Object,
-            new MessageReceivedEventArgs { Data = data });
+        _mockChannel.Object.MessageReceived.Notify(_mockChannel.Object,
+            new MessageReceivedEventArgs { Data = data },
+            "ProxyBaseManagerTests.RaiseMessageReceived()");
     }
 
     protected ProxyDiscoveryManager GetProxyDiscoveryManager()
diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/EventHandlers/TestRequestHandlerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/EventHandlers/TestRequestHandlerTests.cs
index 62591e1c16..89b6b64aa6 100644
--- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/EventHandlers/TestRequestHandlerTests.cs
+++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/EventHandlers/TestRequestHandlerTests.cs
@@ -43,6 +43,7 @@ public TestRequestHandlerTests()
         _mockCommunicationClient = new Mock<ICommunicationEndPoint>();
         _mockCommunicationEndpointFactory = new Mock<ICommunicationEndpointFactory>();
         _mockChannel = new Mock<ICommunicationChannel>();
+        _mockChannel.Setup(mc => mc.MessageReceived).Returns(new TrackableEvent<MessageReceivedEventArgs>());
         _dataSerializer = JsonDataSerializer.Instance;
         _testHostConnectionInfo = new TestHostConnectionInfo
         {
@@ -73,6 +74,7 @@ public TestRequestHandlerTests()
             JsonDataSerializer.Instance,
             _jobQueue);
         _requestHandler.InitializeCommunication();
+
         _mockCommunicationClient.Raise(e => e.Connected += null, new ConnectedEventArgs(_mockChannel.Object));
     }
 
@@ -476,7 +478,10 @@ private void SendMessageOnChannel(Message message)
 
     private void SendMessageOnChannel(string data)
     {
-        _mockChannel.Raise(c => c.MessageReceived += null, new MessageReceivedEventArgs { Data = data });
+        _mockChannel.Object.MessageReceived.Notify(
+            _mockChannel.Object,
+            new MessageReceivedEventArgs { Data = data },
+            "TestRequestHandlerTests.SendMessageOnChannel()");
     }
 
     private void SendSessionEnd()
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeCommunicationChannel.cs b/test/vstest.ProgrammerTests/Fakes/FakeCommunicationChannel.cs
index 2f689fd722..5c2ad3c86a 100644
--- a/test/vstest.ProgrammerTests/Fakes/FakeCommunicationChannel.cs
+++ b/test/vstest.ProgrammerTests/Fakes/FakeCommunicationChannel.cs
@@ -28,6 +28,8 @@ public FakeCommunicationChannel(int id)
     /// </summary>
     public bool Faulted { get; protected set; }
 
+    TrackableEvent<MessageReceivedEventArgs> ICommunicationChannel.MessageReceived => throw new NotImplementedException();
+
     #region ICommunicationChannel
     // The naming for ICommunicationChannel is a bit confusing when this is implemented in-process.
     // Normally one side in one process would have one end of the communication channel,
@@ -68,6 +70,11 @@ public void OnMessageReceived(object sender, MessageReceivedEventArgs eventArgs)
         // and catches the exception. In this code I prefer doing it this way, to see if it is fragile.
         MessageReceived?.Invoke(this, eventArgs);
     }
+
+    public Task NotifyDataAvailable(CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 }
 
 internal class FakeCommunicationChannel<TContext> : FakeCommunicationChannel, ICommunicationChannel