diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala
index ef85cdb9b7..801d1ad7f6 100644
--- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala
+++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala
@@ -207,14 +207,14 @@ abstract class TestProbe[M] {
    * Same as `expectMessageType(clazz, remainingOrDefault)`,but using the
    * default timeout as deadline.
    */
-  def expectMessageClass[T](clazz: Class[T]): T =
+  def expectMessageClass[T <: M](clazz: Class[T]): T =
     expectMessageClass_internal(getRemainingOrDefault.asScala, clazz)
 
   /**
    * Wait for a message of type M and return it when it arrives, or fail if the `max` timeout is hit.
    * The timeout is dilated.
    */
-  def expectMessageClass[T](clazz: Class[T], max: Duration): T =
+  def expectMessageClass[T <: M](clazz: Class[T], max: Duration): T =
     expectMessageClass_internal(max.asScala.dilated, clazz)
 
   /**