diff --git a/src/protobuf-net.Grpc/Internal/Reshape.cs b/src/protobuf-net.Grpc/Internal/Reshape.cs
index 35ab2ab5..a7b029a1 100644
--- a/src/protobuf-net.Grpc/Internal/Reshape.cs
+++ b/src/protobuf-net.Grpc/Internal/Reshape.cs
@@ -287,8 +287,8 @@ private static async IAsyncEnumerable<TResponse> ServerStreamingAsyncImpl<TReque
                         haveMore = await seq.MoveNext(cancellationToken).ConfigureAwait(false);
                     }
                     catch (RpcException fault)
-                    {   // note: the RpcException doesn't seem to carry trailers in this case currently;
-                        // leaving this here so that it gets fixed transparently if that ever changes
+                    {   // note: the RpcException doesn't seem to carry trailers in the managed
+                        // client; see https://github.com/grpc/grpc-dotnet/issues/915
                         metadata?.SetTrailers(fault);
                         throw;
                     }
diff --git a/tests/protobuf-net.Grpc.Test.Integration/StreamTests.cs b/tests/protobuf-net.Grpc.Test.Integration/StreamTests.cs
index a8554986..bb1457a1 100644
--- a/tests/protobuf-net.Grpc.Test.Integration/StreamTests.cs
+++ b/tests/protobuf-net.Grpc.Test.Integration/StreamTests.cs
@@ -195,7 +195,6 @@ async IAsyncEnumerable<Foo> IStreamAPI.ServerStreaming(Foo value, CallContext ct
                 if (i == fault)
                 {
                     var faultTrailers = new Metadata();
-                    AddSum(ctx.ServerCallContext!.ResponseTrailers);
                     AddSum(faultTrailers);
                     throw new RpcException(new Status(StatusCode.Internal, "oops"), faultTrailers);
                 }
@@ -269,9 +268,9 @@ public class Foo
     }
 
 
-    public class NativeStreamTestsFixture : StreamTests
+    public class NativeStreamTests : StreamTests
     {
-        public NativeStreamTestsFixture(StreamTestsFixture fixture, ITestOutputHelper log) : base(10043, fixture, log) { }
+        public NativeStreamTests(StreamTestsFixture fixture, ITestOutputHelper log) : base(10043, fixture, log) { }
         protected override IAsyncDisposable CreateClient(out IStreamAPI client)
         {
             var channel = new Channel("localhost", Port, ChannelCredentials.Insecure);
@@ -288,9 +287,9 @@ public DisposableChannel(Channel channel)
     }
 
 #if NETCOREAPP3_1
-    public class ManagedStreamTestsFixture : StreamTests
+    public class ManagedStreamTests : StreamTests
     {
-        public ManagedStreamTestsFixture(StreamTestsFixture fixture, ITestOutputHelper log) : base(10044, fixture, log) { }
+        public ManagedStreamTests(StreamTestsFixture fixture, ITestOutputHelper log) : base(10044, fixture, log) { }
         protected override IAsyncDisposable CreateClient(out IStreamAPI client)
         {
             var http = global::Grpc.Net.Client.GrpcChannel.ForAddress($"http://localhost:{Port}");