diff --git a/test/message.cpp b/test/message.cpp
index 3775c30a20b3..cf21d5ca50d1 100644
--- a/test/message.cpp
+++ b/test/message.cpp
@@ -37,6 +37,11 @@ public:
 protected:
 	void message(Message *msg)
 	{
+		if (msg->type() != Message::None) {
+			Object::message(msg);
+			return;
+		}
+
 		if (thread() != Thread::current())
 			status_ = InvalidThread;
 		else