diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpEventListener.cs b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpEventListener.cs
index 2e52a4392e3f00..cf9e7446d96fde 100644
--- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpEventListener.cs
+++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpEventListener.cs
@@ -9,31 +9,47 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+using System.Buffers;
 
 namespace HttpStress
 {
     public sealed class LogHttpEventListener : EventListener
     {
         private int _lastLogNumber = 0;
-        private StreamWriter _log;
+        private FileStream _log;
         private Channel<string> _messagesChannel = Channel.CreateUnbounded<string>();
         private Task _processMessages;
-        private CancellationTokenSource _stopProcessing;
+        private CancellationTokenSource _stopProcessing = new CancellationTokenSource();
+        private const string LogDirectory = "./clientlog";
+
+        private FileStream CreateNextLogFileStream()
+        {
+            string fn = Path.Combine(LogDirectory, $"client_{++_lastLogNumber:000}.log");
+            if (File.Exists(fn))
+            {
+                File.Delete(fn);
+            }
+            return new FileStream(fn, FileMode.CreateNew, FileAccess.Write);
+        }
 
         public LogHttpEventListener()
         {
-            foreach (var filename in Directory.GetFiles(".", "client*.log"))
+            if (!Directory.Exists(LogDirectory))
+            {
+                Directory.CreateDirectory(LogDirectory);
+            }
+
+            foreach (string filename in Directory.GetFiles(LogDirectory, "client*.log"))
             {
                 try
                 {
                     File.Delete(filename);
                 } catch {}
             }
-            _log = new StreamWriter("client.log", false) { AutoFlush = true };
-
+            _log = CreateNextLogFileStream();
             _messagesChannel = Channel.CreateUnbounded<string>();
             _processMessages = ProcessMessagesAsync();
-            _stopProcessing = new CancellationTokenSource();
         }
 
         protected override void OnEventSourceCreated(EventSource eventSource)
@@ -46,19 +62,26 @@ protected override void OnEventSourceCreated(EventSource eventSource)
 
         private async Task ProcessMessagesAsync()
         {
-            await Task.Yield();
-
             try
             {
+                byte[] buffer = new byte[8192];
+                var encoding = Encoding.ASCII;
+
                 int i = 0;
                 await foreach (string message in _messagesChannel.Reader.ReadAllAsync(_stopProcessing.Token))
                 {
                     if ((++i % 10_000) == 0)
                     {
-                        RotateFiles();
+                        await RotateFiles();
                     }
-
-                    _log.WriteLine(message);
+                    int maxLen = encoding.GetMaxByteCount(message.Length);
+                    if (maxLen > buffer.Length)
+                    {
+                        buffer = new byte[maxLen];
+                    }
+                    int byteCount = encoding.GetBytes(message, buffer);
+                                        
+                    await _log.WriteAsync(buffer.AsMemory(0, byteCount), _stopProcessing.Token);
                 }
             }
             catch (OperationCanceledException)
@@ -66,20 +89,24 @@ private async Task ProcessMessagesAsync()
                 return;
             }
 
-            void RotateFiles()
+            async ValueTask RotateFiles()
             {
+                await _log.FlushAsync(_stopProcessing.Token);
                 // Rotate the log if it reaches 50 MB size.
-                if (_log.BaseStream.Length > (50 << 20))
+                if (_log.Length > (100 << 20))
                 {
-                    _log.Close();
-                    _log = new StreamWriter($"client_{++_lastLogNumber:000}.log", false) { AutoFlush = true };
+                    await _log.DisposeAsync();
+                    _log = CreateNextLogFileStream();
                 }
             }
         }
 
+        private StringBuilder? _cachedStringBuilder;
+
         protected override async void OnEventWritten(EventWrittenEventArgs eventData)
         {
-            var sb = new StringBuilder().Append($"{eventData.TimeStamp:HH:mm:ss.fffffff}[{eventData.EventName}] ");
+            StringBuilder sb = Interlocked.Exchange(ref _cachedStringBuilder, null) ?? new StringBuilder();
+            sb.Append($"{eventData.TimeStamp:HH:mm:ss.fffffff}[{eventData.EventName}] ");
             for (int i = 0; i < eventData.Payload?.Count; i++)
             {
                 if (i > 0)
@@ -88,13 +115,17 @@ protected override async void OnEventWritten(EventWrittenEventArgs eventData)
                 }
                 sb.Append(eventData.PayloadNames?[i]).Append(": ").Append(eventData.Payload[i]);
             }
-            await _messagesChannel.Writer.WriteAsync(sb.ToString());
+            sb.Append(Environment.NewLine);
+            string s = sb.ToString();
+            sb.Clear();
+            Interlocked.Exchange(ref _cachedStringBuilder, sb);
+            await _messagesChannel.Writer.WriteAsync(s, _stopProcessing.Token);
         }
 
         public override void Dispose()
         {
             base.Dispose();
-
+            _log.Flush();
             if (!_processMessages.Wait(TimeSpan.FromSeconds(30)))
             {
                 _stopProcessing.Cancel();