diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java
index dc0709e1fb8..5ec4f4793b2 100644
--- a/core/src/main/java/io/grpc/internal/ServerImpl.java
+++ b/core/src/main/java/io/grpc/internal/ServerImpl.java
@@ -94,6 +94,8 @@
 public final class ServerImpl extends io.grpc.Server implements InternalInstrumented<ServerStats> {
   private static final Logger log = Logger.getLogger(ServerImpl.class.getName());
   private static final ServerStreamListener NOOP_LISTENER = new NoopListener();
+  static final Attributes.Key<InternalServer> TRANSPORT_SERVER_ATTR =
+      Attributes.Key.create("io.grpc.Grpc.TRANSPORT_ATTR_SERVER_TRANSPORT");
 
   private final InternalLogId logId;
   private final ObjectPool<? extends Executor> executorPool;
@@ -438,6 +440,10 @@ public Attributes transportReady(Attributes attributes) {
       handshakeTimeoutFuture.cancel(false);
       handshakeTimeoutFuture = null;
 
+      final Attributes.Builder builder = attributes.toBuilder();
+      builder.set(TRANSPORT_SERVER_ATTR, transportServer);
+      attributes = builder.build();
+
       for (ServerTransportFilter filter : transportFilters) {
         attributes = Preconditions.checkNotNull(filter.transportReady(attributes),
             "Filter %s returned null", filter);
diff --git a/core/src/test/java/io/grpc/internal/ServerImplTest.java b/core/src/test/java/io/grpc/internal/ServerImplTest.java
index 0f18efe078c..5caeb928782 100644
--- a/core/src/test/java/io/grpc/internal/ServerImplTest.java
+++ b/core/src/test/java/io/grpc/internal/ServerImplTest.java
@@ -723,6 +723,8 @@ public void transportFilters() throws Exception {
     final Attributes.Key<String> key1 = Attributes.Key.create("test-key1");
     final Attributes.Key<String> key2 = Attributes.Key.create("test-key2");
     final Attributes.Key<String> key3 = Attributes.Key.create("test-key3");
+    final Attributes.Key<InternalServer> transportServerKey =
+        ServerImpl.TRANSPORT_SERVER_ATTR;
     final AtomicReference<Attributes> filter1TerminationCallbackArgument =
         new AtomicReference<>();
     final AtomicReference<Attributes> filter2TerminationCallbackArgument =
@@ -732,9 +734,8 @@ public void transportFilters() throws Exception {
     builder.addTransportFilter(new ServerTransportFilter() {
         @Override
         public Attributes transportReady(Attributes attrs) {
-          assertEquals(Attributes.newBuilder()
-              .set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, remoteAddr)
-              .build(), attrs);
+          assertEquals(remoteAddr, attrs.get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR));
+          assertNotNull(attrs.get(transportServerKey));
           readyCallbackCalled.incrementAndGet();
           return attrs.toBuilder()
               .set(key1, "yalayala")
@@ -751,11 +752,10 @@ public void transportTerminated(Attributes attrs) {
     builder.addTransportFilter(new ServerTransportFilter() {
         @Override
         public Attributes transportReady(Attributes attrs) {
-          assertEquals(Attributes.newBuilder()
-              .set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, remoteAddr)
-              .set(key1, "yalayala")
-              .set(key2, "blabla")
-              .build(), attrs);
+          assertEquals(remoteAddr, attrs.get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR));
+          assertNotNull(attrs.get(transportServerKey));
+          assertEquals("yalayala", attrs.get(key1));
+          assertEquals("blabla", attrs.get(key2));
           readyCallbackCalled.incrementAndGet();
           return attrs.toBuilder()
               .set(key1, "ouch")
@@ -769,12 +769,6 @@ public void transportTerminated(Attributes attrs) {
           filter2TerminationCallbackArgument.set(attrs);
         }
       });
-    Attributes expectedTransportAttrs = Attributes.newBuilder()
-        .set(key1, "ouch")
-        .set(key2, "blabla")
-        .set(key3, "puff")
-        .set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, remoteAddr)
-        .build();
 
     createAndStartServer();
     ServerTransportListener transportListener
@@ -782,13 +776,17 @@ public void transportTerminated(Attributes attrs) {
     Attributes transportAttrs = transportListener.transportReady(Attributes.newBuilder()
         .set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, remoteAddr).build());
 
-    assertEquals(expectedTransportAttrs, transportAttrs);
+    assertEquals(remoteAddr, transportAttrs.get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR));
+    assertNotNull(transportAttrs.get(transportServerKey));
+    assertEquals("ouch", transportAttrs.get(key1));
+    assertEquals("blabla", transportAttrs.get(key2));
+    assertEquals("puff", transportAttrs.get(key3));
 
     server.shutdown();
     server.awaitTermination();
 
-    assertEquals(expectedTransportAttrs, filter1TerminationCallbackArgument.get());
-    assertEquals(expectedTransportAttrs, filter2TerminationCallbackArgument.get());
+    assertEquals(transportAttrs, filter1TerminationCallbackArgument.get());
+    assertEquals(transportAttrs, filter2TerminationCallbackArgument.get());
     assertEquals(2, readyCallbackCalled.get());
     assertEquals(2, terminationCallbackCalled.get());
   }