diff --git a/gradle.properties b/gradle.properties
index 2fb2ff37b4..c70eaf7b20 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -52,7 +52,7 @@ apacheDirectoryServerVersion=1.5.7
 commonsLangVersion=2.6
 
 # gRPC
-grpcVersion=1.24.2
+grpcVersion=1.25.0
 protobufGradlePluginVersion=0.8.10
 protobufVersion=3.10.0
 protoGoogleCommonProtosVersion=1.17.0
diff --git a/servicetalk-grpc-netty/src/test/java/io/servicetalk/grpc/netty/ProtocolCompatibilityTest.java b/servicetalk-grpc-netty/src/test/java/io/servicetalk/grpc/netty/ProtocolCompatibilityTest.java
index cc99d47b43..91f786dca5 100644
--- a/servicetalk-grpc-netty/src/test/java/io/servicetalk/grpc/netty/ProtocolCompatibilityTest.java
+++ b/servicetalk-grpc-netty/src/test/java/io/servicetalk/grpc/netty/ProtocolCompatibilityTest.java
@@ -556,11 +556,11 @@ private static void assertStatusRuntimeException(final StatusRuntimeException st
         final Status grpcStatus = statusException.getStatus();
         assertEquals(CUSTOM_ERROR_MESSAGE, grpcStatus.getDescription());
         final com.google.rpc.Status status = StatusProto.fromThrowable(statusException);
+        assertNotNull(status);
         if (withStatus) {
-            assertNotNull(status);
             assertStatus(status, grpcStatus.getCode().value(), grpcStatus.getDescription());
         } else {
-            assertNull(status);
+            assertFallbackStatus(status, grpcStatus.getCode().value(), grpcStatus.getDescription());
         }
     }
 
@@ -575,6 +575,14 @@ private static void assertStatus(final com.google.rpc.Status status,
         assertEquals(999, detail.getId());
     }
 
+    private static void assertFallbackStatus(final com.google.rpc.Status status, final int expectedCode,
+                                             @Nullable final String expectedMessage) {
+        assertEquals(expectedCode, status.getCode());
+        assertEquals(expectedMessage, status.getMessage());
+        final List<Any> anyList = status.getDetailsList();
+        assertEquals(0, anyList.size());
+    }
+
     private static com.google.rpc.Status newStatus() {
         // We just use CompatResponse as part of the status to keep it simple.
         return com.google.rpc.Status.newBuilder()