diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionDefaultHandleSpec.scala
similarity index 99%
rename from interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
rename to interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionDefaultHandleSpec.scala
index 3741768a..80a72e8e 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionDefaultHandleSpec.scala
@@ -31,7 +31,7 @@ import org.scalatest.wordspec.AnyWordSpecLike
 
 import scala.concurrent.{ ExecutionContext, Future }
 
-class GrpcExceptionHandlerSpec
+class GrpcExceptionDefaultHandleSpec
     extends TestKit(ActorSystem("GrpcExceptionHandlerSpec"))
     with AnyWordSpecLike
     with Matchers
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
index 7da9d95e..92936b04 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
@@ -48,10 +48,10 @@ class GrpcExceptionHandlerSpec extends AnyWordSpec with Matchers with ScalaFutur
 
   val otherTypes: Seq[Throwable] = Seq(
     new GrpcServiceException(status = Status.DEADLINE_EXCEEDED),
-    new NotImplementedError,
-    new UnsupportedOperationException,
-    new NullPointerException,
-    new RuntimeException,
+    new NotImplementedError(),
+    new UnsupportedOperationException(),
+    new NullPointerException(),
+    new RuntimeException(),
     new StatusRuntimeException(io.grpc.Status.DEADLINE_EXCEEDED))
 
   val executionExceptions: Seq[Throwable] =