diff --git a/src/tests/kits/app/bmessenger/SMInvoker.cpp b/src/tests/kits/app/bmessenger/SMInvoker.cpp
index d84959f8df..c7681047d2 100644
--- a/src/tests/kits/app/bmessenger/SMInvoker.cpp
+++ b/src/tests/kits/app/bmessenger/SMInvoker.cpp
@@ -121,3 +121,31 @@ SMInvoker4::Invoke(BMessenger &target, BHandler *replyHandler,
 	return result;
 }
 
+
+// SMInvoker5
+
+// constructor
+SMInvoker5::SMInvoker5(bool useMessage, bool useReply,
+					   bigtime_t deliveryTimeout, bigtime_t replyTimeout)
+		  : SMInvoker(),
+			fUseMessage(useMessage),
+			fUseReply(useReply),
+			fDeliveryTimeout(deliveryTimeout),
+			fReplyTimeout(replyTimeout)
+{
+}
+
+// Invoke
+status_t
+SMInvoker5::Invoke(BMessenger &target, BHandler *replyHandler,
+				   BMessenger &replyMessenger)
+{
+	if (fUseReply)
+		fReplyMessage = new BMessage(0UL);
+	BMessage _message(MSG_TEST);
+	BMessage *message = (fUseMessage ? &_message : NULL);
+	status_t result = target.SendMessage(message, fReplyMessage,
+										 fDeliveryTimeout, fReplyTimeout);
+	return result;
+}
+
diff --git a/src/tests/kits/app/bmessenger/SMInvoker.h b/src/tests/kits/app/bmessenger/SMInvoker.h
index 30a8b314f3..95cf6481dd 100644
--- a/src/tests/kits/app/bmessenger/SMInvoker.h
+++ b/src/tests/kits/app/bmessenger/SMInvoker.h
@@ -72,4 +72,20 @@ private:
 	bool		fUseReply;
 };
 
+// Invoker for SendMessage(BMessage *, BMessage *, bigtime_t, bigtime_t)
+class SMInvoker5 : public SMInvoker {
+public:
+	SMInvoker5(bool useMessage, bool useReply, bigtime_t deliveryTimeout,
+			   bigtime_t replyTimeout);
+
+	virtual status_t Invoke(BMessenger &target, BHandler *replyHandler,
+							BMessenger &replyMessenger);
+
+private:
+	bool		fUseMessage;
+	bool		fUseReply;
+	bigtime_t	fDeliveryTimeout;
+	bigtime_t	fReplyTimeout;
+};
+
 #endif	// SM_INVOKER_H