diff --git a/test/Dapr.Cryptography.Test/Encryption/DecryptionStreamProcessorTests.cs b/test/Dapr.Cryptography.Test/Encryption/DecryptionStreamProcessorTests.cs
index d2049e32e..f9bb22a9f 100644
--- a/test/Dapr.Cryptography.Test/Encryption/DecryptionStreamProcessorTests.cs
+++ b/test/Dapr.Cryptography.Test/Encryption/DecryptionStreamProcessorTests.cs
@@ -185,9 +185,12 @@ public async Task ProcessStreamAsync_AssignsSequenceNumbersInOrder()
     [Fact]
     public async Task ProcessStreamAsync_WithEmptyStream_SendsNoRequests()
     {
+        var requestStreamCompleted = new TaskCompletionSource();
+
         var mockRequestStream = new Mock<IClientStreamWriter<Autogenerated.DecryptRequest>>();
         mockRequestStream
             .Setup(x => x.CompleteAsync())
+            .Callback(() => requestStreamCompleted.SetResult())
             .Returns(Task.CompletedTask);
 
         var mockResponseStream = new Mock<IAsyncStreamReader<Autogenerated.DecryptResponse>>();
@@ -203,6 +206,7 @@ public async Task ProcessStreamAsync_WithEmptyStream_SendsNoRequests()
         using var processor = new DecryptionStreamProcessor();
         await processor.ProcessStreamAsync(inputStream, call, 4096, options, TestContext.Current.CancellationToken);
         await foreach (var _ in processor.GetProcessedDataAsync(TestContext.Current.CancellationToken)) { }
+        await requestStreamCompleted.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
 
         mockRequestStream.Verify(
             x => x.WriteAsync(It.IsAny<Autogenerated.DecryptRequest>(), It.IsAny<CancellationToken>()),
diff --git a/test/Dapr.Cryptography.Test/Encryption/EncryptionStreamProcessorTests.cs b/test/Dapr.Cryptography.Test/Encryption/EncryptionStreamProcessorTests.cs
index 5169ab2ac..65e31a265 100644
--- a/test/Dapr.Cryptography.Test/Encryption/EncryptionStreamProcessorTests.cs
+++ b/test/Dapr.Cryptography.Test/Encryption/EncryptionStreamProcessorTests.cs
@@ -186,9 +186,12 @@ public async Task ProcessStreamAsync_AssignsSequenceNumbersInOrder()
     [Fact]
     public async Task ProcessStreamAsync_WithEmptyStream_SendsNoRequests()
     {
+        var requestStreamCompleted = new TaskCompletionSource();
+
         var mockRequestStream = new Mock<IClientStreamWriter<Autogenerated.EncryptRequest>>();
         mockRequestStream
             .Setup(x => x.CompleteAsync())
+            .Callback(() => requestStreamCompleted.SetResult())
             .Returns(Task.CompletedTask);
 
         var mockResponseStream = new Mock<IAsyncStreamReader<Autogenerated.EncryptResponse>>();
@@ -204,6 +207,7 @@ public async Task ProcessStreamAsync_WithEmptyStream_SendsNoRequests()
         using var processor = new EncryptionStreamProcessor();
         await processor.ProcessStreamAsync(inputStream, call, options, 4096, TestContext.Current.CancellationToken);
         await foreach (var _ in processor.GetProcessedDataAsync(TestContext.Current.CancellationToken)) { }
+        await requestStreamCompleted.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
 
         mockRequestStream.Verify(
             x => x.WriteAsync(It.IsAny<Autogenerated.EncryptRequest>(), It.IsAny<CancellationToken>()),